Merge "[automerger skipped] [DO NOT MERGE] Update oriole SVN to 31 am: abfd17b3c1
-s ours am: fc6271573e
-s ours am: c319365d5b
-s ours am: b124277812
-s ours" into tm-qpr-dev-plus-aosp
This commit is contained in:
commit
7d1487ea94