tree 2235b3628109d04c7a62e836870630fef1129db3
parent 803434b0e3334a7bdb7ebbcf9e312b4adfcee08f
parent ed0bdd422da488289ec829d2d59b74e7be3eaaec
author Chih-Hung Hsieh <chh@google.com> 1418337238 -0800
committer Chih-Hung Hsieh <chh@google.com> 1418337238 -0800

resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp

Change-Id: Ife8b72d3688ed78a95ccb8d5e0b60f40e7fec9e9