| commit | 0ecedf6b2e7da78f4c22ea07be6789a71ba2d8f0 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Mon Mar 24 19:44:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 19:44:25 2014 +0000 |
| tree | e917e788e0bc959ba7a6d4ef8b73f98cd4bb503e | |
| parent | 7f2927a09dd19f5368bbc1e042c86f9c3da2ddb2 [diff] | |
| parent | b7f61da71b8ce161b275bf4c2a6ff771ad63848d [diff] |
am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit 'b7f61da71b8ce161b275bf4c2a6ff771ad63848d': DO NOT MERGE. Fix merge artifact.