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