| commit | ead746a3250dac32844f736030870c457e0dd9b1 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 20:35:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:35:21 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | d6652af5b0e980aa22870d288a6718c2bd3a59f2 [diff] | |
| parent | 5d73fb70f53da6aec0f4ce73c833a53a2cdca3bd [diff] |
am 5d73fb70: am 8493aacd: am ab37bce3: Merge changes If379cc4b,I1c6ccb01 into jb-ub-now-indigo-rose * commit '5d73fb70f53da6aec0f4ce73c833a53a2cdca3bd':