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