| commit | b4d74b48e46c5bf99ae0f2856e87bbb239730bb8 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Sun Mar 22 00:40:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 22 00:40:40 2015 +0000 |
| tree | 438489018c5db432c1f1d615f9e2e52b0b5bd5c5 | |
| parent | cd9a5b7e1bb04e74c3a1f63ad385911443c021fe [diff] | |
| parent | 56f4a152fcb19c3b917622dd1773a90ebd8d5be9 [diff] |
am 56f4a152: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '56f4a152fcb19c3b917622dd1773a90ebd8d5be9':