| commit | 3e109f08db918789b2c294fe8b0e74ceb870b6c2 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Apr 09 18:16:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 18:16:45 2015 +0000 |
| tree | 26849d335ebdcddcad5a91ef6c19aea7dcf545ca | |
| parent | bcf230faf95417eee92066e3749125e04c8f4266 [diff] | |
| parent | 2d7987ba34f36a344e38897bb8b4c3d3ed68cd38 [diff] |
am 2d7987ba: (-s ours) DO NOT MERGE ANYWHERE * commit '2d7987ba34f36a344e38897bb8b4c3d3ed68cd38': DO NOT MERGE ANYWHERE