tree cba62d0d64153aa2169651696bc238591341d679
parent 1f36548891c2865b4dd4362bbee131b9a8a0abcc
parent a04a89d3f5bf5c74be2c45edf4a8e2fa26f7b071
author Winson Chung <winsonc@google.com> 1414085327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085327 +0000

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 'a04a89d3f5bf5c74be2c45edf4a8e2fa26f7b071':