tree b1c5a328c9e4e4a921cae27eaafa27206288144a
parent d7cc9e3163ee19f9d6acf153209b52c47514c0ce
parent da34482dfc879e741f1ab2f64a0c1741640186da
author Vinod Krishnan <vinodkrishnan@google.com> 1397605908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397605908 +0000

am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev

* commit 'da34482dfc879e741f1ab2f64a0c1741640186da':
  Set wearable specific strings in framework