tree c34a0d4fb915baa2c27fded63398f68bc6a7aeab
parent 6babc527cedd6005d61d21bf41420e27336c3a1e
parent 84c373d7a9a419412cd0b0231e18190c2d956c78
author Keun young Park <keunyoung@google.com> 1362517952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362517952 +0000

am 84c373d7: am 2b2a4312: am c21e39c2: (-s ours) am 00c0a0c3: (-s ours) am 70408eae: (-s ours) am df784e45: Merge "update holo DO NOT MERGE" into jb-dev

* commit '84c373d7a9a419412cd0b0231e18190c2d956c78':