commit | 0cefbc7d1133d0c9df5b9265d2acd1d3315daf6e | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Fri Jun 06 22:04:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 22:04:14 2014 +0000 |
tree | a704e065ec4a5c3b2c41c309a870dce41a938245 | |
parent | 49378067cde003c0443d6837c01085ee63482889 [diff] | |
parent | 77762c586d861bcc90ec9ac0211dddc886df4db0 [diff] |
am 77762c58: (-s ours) DO NOT MERGE Material theme * commit '77762c586d861bcc90ec9ac0211dddc886df4db0': DO NOT MERGE Material theme