commit | 202633d0aa99de903f57c8372cc72b7349ba38e4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:58 2014 +0000 |
tree | e893de54b6f8ecc7dd8b25d539a3de59b1a20f79 | |
parent | 4c2b869a3a30b257acce46d470e92e835a9eb82c [diff] | |
parent | 479397047075e236af9b23848371aa302d95c213 [diff] |
am 47939704: am 428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master * commit '479397047075e236af9b23848371aa302d95c213':