commit | 479397047075e236af9b23848371aa302d95c213 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 01:13:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 01:13:18 2014 +0000 |
tree | 5a693c9d1bcaa486a6fe88dc402fa403f6bcd4db | |
parent | e4f22d3cfc4f8826d27e81f9a87d653ef505b5b7 [diff] | |
parent | 428c861a8e8aed4aa3224bd8d18211c9e6ca1c64 [diff] |
am 428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master * commit '428c861a8e8aed4aa3224bd8d18211c9e6ca1c64':