| commit | b4948d7e03e666323329c907e5e4dd96d8f24ae7 | [log] [tgz] |
|---|---|---|
| author | Max Cai <maxtroy@google.com> | Thu Aug 21 02:47:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 02:47:29 2014 +0000 |
| tree | dbb8abe3f82dcd8e5419983ff33160ce85dfa03f | |
| parent | 106ab9f85586bff1cca54f2310eda0fe5c915dc3 [diff] | |
| parent | 1eda7ff1456a39f136bedb80eb70b8b9d0f2a747 [diff] |
am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':