| commit | 448ed20b745995db7eb53a320aa4c4ee824baec6 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:21:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:21:54 2014 +0000 |
| tree | 08aef59e092dfb94ed9f49f103f6ee95edd10d6a | |
| parent | a14f572c6248cfbc3fc5d5635ea7d64de879ebe0 [diff] | |
| parent | 599f068ea9a52d5cf6bd5197ac3c6991b3d7809e [diff] |
am 599f068e: am a52d69f6: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master * commit '599f068ea9a52d5cf6bd5197ac3c6991b3d7809e':