tree 600d2238f97f83bb67c1f5986c1a091eca046415
parent 1599a4a0dc066646e06a63cddb9cb28211a1160d
parent 7a2df74b1124746fa5400d3ed5e6e3680c8f3601
author Vinod Krishnan <vinodkrishnan@google.com> 1426758483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426758483 +0000

am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
  Make Theme.Micro point to Theme.Material