| commit | 247aef7564be66179a988e74bd695c324e36f6dd | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jul 15 17:08:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:30 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | e862217461bdf0d460b71d80b800a86be1eb61fc [diff] | |
| parent | 490701a3feb84f73e5af9a2c4740f4d4be8455b7 [diff] |
am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. * commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':