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