| commit | 6e27c3bc65a35270d25400c85e96450de457f9e5 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 23 17:26:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:26:37 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 6a9137f482060c9e6d7ebab668b0a1fabb96efe2 [diff] | |
| parent | 7504cc1cd176f475738bf5f1c03f5db532a42f58 [diff] |
am 7504cc1c: am ead746a3: am 5d73fb70: am 8493aacd: am ab37bce3: Merge changes If379cc4b,I1c6ccb01 into jb-ub-now-indigo-rose * commit '7504cc1cd176f475738bf5f1c03f5db532a42f58':