tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 3725443e69a0fdb7b04df1d50b7db4a77c60d97b
parent ead746a3250dac32844f736030870c457e0dd9b1
author Adam Cohen <adamcohen@google.com> 1392410993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410993 +0000

am ead746a3: am 5d73fb70: am 8493aacd: am ab37bce3: Merge changes If379cc4b,I1c6ccb01 into jb-ub-now-indigo-rose

* commit 'ead746a3250dac32844f736030870c457e0dd9b1':