| commit | b7f61da71b8ce161b275bf4c2a6ff771ad63848d | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Sat Mar 22 03:50:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 22 03:50:07 2014 +0000 |
| tree | ade99219dcc37d438d8803cd3fb8f1847f2f0520 | |
| parent | 4889048e2b02d0f1ec2d7c1a606ef039c2c97b63 [diff] | |
| parent | 7fa4c759187108af122f071944faf5aaeec0f98d [diff] |
am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit '7fa4c759187108af122f071944faf5aaeec0f98d': DO NOT MERGE. Fix merge artifact.