tree 0ae1dffe2eed0bd32b89ab126de70562661593b3
parent 17f85eab24739c2982bf0613a13b155f712e045d
parent e7a3bcbbb8083e812ce07a5459f0e6d30edfb9fe
author Conley Owens <cco3@android.com> 1344968479 -0700
committer Conley Owens <cco3@android.com> 1344969274 -0700

Merge branch 'master' into maint

master's original purpose was to forge ahead on using git submodules,
but this route has been abandoned.

Change-Id: I164a9efc7821bcd1b941ad76649764722046081b