refs/heads/lollipop-mr1-dev - platform/frameworks/opt/chips

commit: 2b49833077e63d0e38afa4d703ccd27b6a3cc600
[log]
author: Baligh Uddin <[email protected]>
Sun Oct 19 22:23:44 2014 +0000
committer: Android Git Automerger <[email protected]>
Sun Oct 19 22:23:44 2014 +0000
tree: 114fbd18af676cd735e27e46e5efcf05637ad0a0
parent: 4f00fc7d0347b785821e7bb97006c33a860864e4 [diff]
parent: 19fac962d0b00b061152605365440322c7232c71 [diff]

am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit '19fac962d0b00b061152605365440322c7232c71':
  Import translations. DO NOT MERGE

tree: 114fbd18af676cd735e27e46e5efcf05637ad0a0

res/
sample/
src/
tests/
Android.mk
AndroidManifest.xml
project.properties