Commit 710885ff authored Aug 27, 2015 by Sebastien Hertz Committed by Android Git Automerger Aug 27, 2015

am 69ee2b6b: am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved...

am 69ee2b6b: am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit '69ee2b6b43de666162c998f935197fb0d00065c7':

parents dec6e66b c18dd399

There are no changes