| commit | ad9be57dd5bcc8d66e2c9916153b93d0ae29ff58 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Wed Oct 29 07:01:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:34 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | dee9f13a1429bd5247692bb586cd44a5c5ed279e [diff] | |
| parent | 6e27c3bc65a35270d25400c85e96450de457f9e5 [diff] |
am 6e27c3bc: am 7504cc1c: am ead746a3: am 5d73fb70: am 8493aacd: am ab37bce3: Merge changes If379cc4b,I1c6ccb01 into jb-ub-now-indigo-rose * commit '6e27c3bc65a35270d25400c85e96450de457f9e5':