refs/heads/lollipop-mr1-release - platform/frameworks/opt/setupwizard

commit: c41e64ca8aecc294d911f9eca039f91157a3f70a
[log]
author: Baligh Uddin <[email protected]>
Sun Oct 19 20:02:56 2014 +0000
committer: Android Git Automerger <[email protected]>
Sun Oct 19 20:02:56 2014 +0000
tree: 3786b268f84d6e5b24e8ccbe205659a423785282
parent: 370ee42793d9585353c196c4063647c1ea99ea9b [diff]
parent: e2dd056481acd2ef399ffbb020ff2bc5c1e460eb [diff]

am e2dd0564: (-s ours) am 01444335: (-s ours) Import translations. DO NOT MERGE

* commit 'e2dd056481acd2ef399ffbb020ff2bc5c1e460eb':
  Import translations. DO NOT MERGE

tree: 3786b268f84d6e5b24e8ccbe205659a423785282

navigationbar/
.gitignore