| commit | a7c599a1aaf58ddd9d4747ad2a15d5a23f5336a0 | [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 | fa7ac415d6d8e8d12509e3757400c108d2cce7ab | |
| parent | b7f71268276f56cd4b15ac51bffbb14e55480788 [diff] | |
| parent | ab2fcde5947a7de9c368b713400cff309a32158b [diff] |
am ab2fcde5: am d6fb6247: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master * commit 'ab2fcde5947a7de9c368b713400cff309a32158b':