refs/heads/marshmallow-dr1.5-dev - platform/packages/apps/KeyChain

commit: bbdf253cf21c31940e3fda795ddfc63bd8edc104
[log]
author: Baligh Uddin <[email protected]>
Fri Sep 25 03:16:30 2015 +0000
committer: Android Git Automerger <[email protected]>
Fri Sep 25 03:16:30 2015 +0000
tree: 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d
parent: ba9f859ff76b506e1a5d8c84fad6e576b1aa09ff [diff]
parent: 4e3ae4c3ac0a7ee79e342bbb0e51e6fa6d431009 [diff]

am 4e3ae4c3: (-s ours) am 4eaca148: (-s ours) Import translations. DO NOT MERGE

* commit '4e3ae4c3ac0a7ee79e342bbb0e51e6fa6d431009':
  Import translations. DO NOT MERGE

tree: 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d

res/
src/
support/
tests/
Android.mk
AndroidManifest.xml