tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent d6652af5b0e980aa22870d288a6718c2bd3a59f2
parent 5d73fb70f53da6aec0f4ce73c833a53a2cdca3bd
author Adam Cohen <adamcohen@google.com> 1392410121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410121 +0000

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

* commit '5d73fb70f53da6aec0f4ce73c833a53a2cdca3bd':