| commit | a3dd7f1fcc086146643b6edc5aa37dbf5343d2ff | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Oct 23 17:25:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:25:14 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | c5afe6f8f5658f8509b9735295bece3ae50d14aa [diff] | |
| parent | 440e66e827f4658cea070df1f8dea394b2f5f69d [diff] |
am 440e66e8: (-s ours) am e1a015da: am a78b25f8: DO NOT MERGE * commit '440e66e827f4658cea070df1f8dea394b2f5f69d':