| commit | 6720273a04f940de2b383128b7596f33d781f231 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Mon Mar 24 22:54:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 22:54:33 2014 +0000 |
| tree | af8137dcc81a2bf12f74707f52f411907df7a104 | |
| parent | 0d09c5dfa0d7738c177ffa00b230cdb147ec26af [diff] | |
| parent | 80703956c8a761aa447d768d7a5356eae47548d1 [diff] |
am 80703956: (-s ours) am 304b6f7b: am 0ecedf6b: am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit '80703956c8a761aa447d768d7a5356eae47548d1': DO NOT MERGE. Fix merge artifact.