| commit | b6459f900c84edf8f9fd3efb7ecdeea724a5886b | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Jun 06 22:04:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 22:04:15 2014 +0000 |
| tree | c6237d1d1f63851280a444dc77ac8f5b7de1b257 | |
| parent | afedca374ff6e13291fa681a71a1799e2d205a05 [diff] | |
| parent | e5af4a34445c469ea4fdfaac6b713091b4705bfd [diff] |
am 064b0400: (-s ours) DO NOT MERGE Material theme * commit '064b0400dbef7f3427683b5138b6b5bbbd3d5612': DO NOT MERGE Material theme