| commit | d1be3eda42a6d9b156fd43014ae762dd166bfb0d | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Apr 23 03:40:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 23 03:40:34 2015 +0000 |
| tree | 89ec194a53587af14bb4581ab5ac668da7ed50c5 | |
| parent | d006c05250242ca3721d5e8d904a0867116e2a53 [diff] | |
| parent | e5776e4ea82299b1e20f375dff9791aef2133cb9 [diff] |
am e5776e4e: (-s ours) DO NOT MERGE ANYWHERE. * commit 'e5776e4ea82299b1e20f375dff9791aef2133cb9': DO NOT MERGE ANYWHERE.