| commit | d9e79df27877ea2b7bf55044f4bde687f28a6ac5 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:27:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:27:51 2015 +0000 |
| tree | bf7fdbb6d4c1e8018e2abf2227bf6eeb57c48d52 | |
| parent | 2ae49ab73f4ace163b9b6aa9e59e15cc5cc4cfd5 [diff] | |
| parent | 25a2979c374bda4f4aa26b26bc72a28fa55f38cf [diff] |
am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '25a2979c374bda4f4aa26b26bc72a28fa55f38cf':