tree 19c9624e6e4cda73a4491a7795f5d6da68abf944
parent f288eab6b09d431f7760569fb055698bd2265cb5
parent bcb2839d576f1e91f0085d09c2b279d03053910f
author RoboErik <epastern@google.com> 1394665487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394665487 +0000

am bcb2839d: (-s ours) am 306c4688: am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge

* commit 'bcb2839d576f1e91f0085d09c2b279d03053910f':
  b/12068020 Make kb layouts only unique to vendor/product. Do not merge