diff options
| author | Nancy Chen <nancychen@google.com> | 2014-11-17 20:20:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:20:34 +0000 |
| commit | 8eedfbf1c540db4e742525eb0a91cb230701b9f5 (patch) | |
| tree | 380175a074debf34a19203a731b7639d2efc733a /proguard.flags | |
| parent | 677a572ff4f790e7ad198d28c151d73fd05b4d08 (diff) | |
| parent | afe050a8718720f546f5ea17c9f92fdeb6da8895 (diff) | |
am afe050a8: am 0274a22b: Merge "Add a color for settings button." into lmp-mr1-dev
* commit 'afe050a8718720f546f5ea17c9f92fdeb6da8895':
Add a color for settings button.
Diffstat (limited to 'proguard.flags')
0 files changed, 0 insertions, 0 deletions