| commit | 599f068ea9a52d5cf6bd5197ac3c6991b3d7809e | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:17:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:17:06 2014 +0000 |
| tree | fdb6eb5521e7cb7f88685022cff686bd4649d058 | |
| parent | 6a1c0059b11c1e4459875beb81f0bf78ed6aa746 [diff] | |
| parent | a52d69f62e33ff4a690ff5d18be8723087cd22c4 [diff] |
am a52d69f6: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master * commit 'a52d69f62e33ff4a690ff5d18be8723087cd22c4':