| commit | 40855f92bd3f5c398c9a90effe4b5796ca14a116 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Tue May 13 23:48:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:48:54 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 6fb98a30961ec36665b0f1eebd19da5143c92876 [diff] | |
| parent | 7b9e8cfb8c361869f70dc4b63d0da7388251d850 [diff] |
am 7b9e8cfb: (-s ours) am 6720273a: am 80703956: (-s ours) am 304b6f7b: am 0ecedf6b: am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit '7b9e8cfb8c361869f70dc4b63d0da7388251d850':