| commit | 565aa7df76cd0e55bd5ba71d8ab4818f13ac2604 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 20:58:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:28 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | e4f7b857ec3a62018671e87ee6a541f33db274da [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':