commit | 7fdbe99b18c655d197205e795614660fb9f84c0a | [log] [tgz] |
---|---|---|
author | Andrew Lee <anwlee@google.com> | Fri Sep 19 07:42:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:42:51 2014 +0000 |
tree | d9af332a4595a67258d6b49468fc531c260c790e | |
parent | 233abbf9bf7c7e2c3b91c6101f246115a83114da [diff] | |
parent | 05506acf177a8aa407bd087671451e9d47b8d568 [diff] |
am 05506acf: am 45d9cd00: am 3ecea0ad: Merge "Add strings for revised settings page." into lmp-dev * commit '05506acf177a8aa407bd087671451e9d47b8d568':