| commit | bb8337fe0fbdd27c91ca0208f9492cf7bf738af0 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Tue Aug 14 11:21:19 2012 -0700 |
| committer | Conley Owens <cco3@android.com> | Tue Aug 14 11:34:34 2012 -0700 |
| tree | 0ae1dffe2eed0bd32b89ab126de70562661593b3 | |
| parent | 17f85eab24739c2982bf0613a13b155f712e045d [diff] | |
| parent | e7a3bcbbb8083e812ce07a5459f0e6d30edfb9fe [diff] |
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