| commit | e9324d0f8204a82db45cd86cc7cd3fb3025f9681 | [log] [tgz] |
|---|---|---|
| author | Eric Gilmore <egilmore@google.com> | Mon Nov 03 21:01:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 21:01:54 2014 +0000 |
| tree | 10a3ce3f8977e7159435723b27ea392a6d0bfcbf | |
| parent | 194d2026a3fc685a0ed9afc8080060155a983c95 [diff] | |
| parent | 7ecb0a3e5c50837d1b9ea6d952805a9b3795448e [diff] |
am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 * commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':