| commit | 311bf2298ea4352e51302bf5f2d12d5393f60d90 | [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 | 0541c5adb0acab8e6603bda20385a174d84457fa | |
| parent | 319d36a9d1f425d3044215f109a0e70cfdb2b034 [diff] | |
| parent | 14fba07cf0a8e112af288a9f92bc8458ec9a8b25 [diff] |
am 14fba07c: (-s ours) DO NOT MERGE Material theme * commit '14fba07cf0a8e112af288a9f92bc8458ec9a8b25': DO NOT MERGE Material theme