commit | 466493def0d29e9d2ef909dbec70dfba42cdd924 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:28:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:28:15 2015 +0000 |
tree | c7eca0934c43657ce4581edf263f06c571842a5d | |
parent | d32bfb65ca3e8013aa8525c607c694ce8379d4b1 [diff] | |
parent | 7a5f4da1327011a5d3aaf28c99b98bbb1bf83b5e [diff] |
am 7a5f4da1: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '7a5f4da1327011a5d3aaf28c99b98bbb1bf83b5e':