refs/heads/lollipop-mr1-cts-release - platform/frameworks/opt/timezonepicker

commit: 127d2a7c9a253963772122958184d4d76160f4be
[log]
author: Baligh Uddin <[email protected]>
Tue Sep 16 16:50:56 2014 +0000
committer: Android Git Automerger <[email protected]>
Tue Sep 16 16:50:56 2014 +0000
tree: 6543d28ebca86f49937beeabce59a026ef103e23
parent: 64ef17b7bae77162a1e30643979f54515dca04ca [diff]
parent: 31594acd60d903050a7f25f88c8651f33226cdf8 [diff]

am 31594acd: (-s ours) am 66c0bba1: (-s ours) Import translations. DO NOT MERGE

* commit '31594acd60d903050a7f25f88c8651f33226cdf8':
  Import translations. DO NOT MERGE

tree: 6543d28ebca86f49937beeabce59a026ef103e23

assets/
libs/
res/
src/
.gitignore
Android.mk
AndroidManifest.xml
project.properties