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