am a2191764: (-s ours) am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev

* commit 'a2191764f3536dbbe1596553bb34b929ba19dc0b':
This commit is contained in:
Tao Bao 2015-08-27 05:00:47 +00:00 committed by Android Git Automerger
commit 6f01e88263

Diff content is not available