| commit | cb7560111186540d1b0e2b824272c11ed019ce22 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Apr 30 12:50:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:13 2014 +0000 |
| tree | af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93 | |
| parent | f28418f3b3df45cae15b58077578d5e09ac1f5a6 [diff] | |
| parent | 822a92438a427c539ce392687252ec45921c8257 [diff] |
am 822a9243: (-s ours) am 953d1d4b: (-s ours) am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit '822a92438a427c539ce392687252ec45921c8257':