tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent eec6e8a176af7a5767e143e83c9133bd1ee84311
parent 748c046999e0ead012816e2bc63d96e3b9a47162
author Winson Chung <winsonc@google.com> 1392411102 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411102 +0000

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

* commit '748c046999e0ead012816e2bc63d96e3b9a47162':