commit | be6ea75e6b873b15d14d6df1d1409cf5e08399f0 | [log] [tgz] |
---|---|---|
author | Nancy Chen <nancychen@google.com> | Tue Nov 11 22:57:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 22:57:51 2014 +0000 |
tree | 5b6627776ebd17346462c268536be3f25e7db4c6 | |
parent | bc7f6065e062c4753f7252b87f9e0a9459468d33 [diff] | |
parent | a0026149acea3b7a0ee86e71ecea61ec2a75e767 [diff] |
am 3c2dd89d: Merge "String resource edits for InCallUI" into lmp-mr1-dev * commit '3c2dd89d8de7a9722f501eb0b7ac691c3be44efa': String resource edits for InCallUI