Merge \"Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2cb5 am: cfe0f07499\" into nyc-mr1-dev-plus-aosp

am: c54df7910a

Change-Id: I115a64d939ac4a0cc3725d7f1a97726bee353652
This commit is contained in:
Yohei Yukawa
2016-06-17 18:54:50 +00:00
committed by android-build-merger

Diff Content Not Available