tree 10da860fcff71886af91d082e31f0e1917926848
parent 1f3b0009bb5d45cbdfff106894f6a8055bc10f21
parent a0c6605b67863410b82b6dde322423dc23680967
author Winson Chung <winsonc@google.com> 1414566248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566248 +0000

am a0c6605b: am a04a89d3: am 748c0469: am d5ebb871: am bf18889a: am d1e474a9: Merge "Initial changes for new clings. (Bug 11142616)" into jb-ub-now-indigo-rose

* commit 'a0c6605b67863410b82b6dde322423dc23680967':