OSDN Git Service

resolved conflicts for merge of 5e05bb74 to lmp-mr1-dev-plus-aosp
authorHans Boehm <hboehm@google.com>
Mon, 8 Dec 2014 21:16:27 +0000 (13:16 -0800)
committerHans Boehm <hboehm@google.com>
Mon, 8 Dec 2014 21:16:27 +0000 (13:16 -0800)
commit8c14561a0f95073f358b8b749d72975d1e8b5f1d
tree0572197940c4ca2235e4a43119ea800428f17a8d
parent4b452f14e55286db25099f74a06e6e3f2d11b601
parent5e05bb74dc2350db44ef239d7ca798ffea98a0a6
resolved conflicts for merge of 5e05bb74 to lmp-mr1-dev-plus-aosp

Change-Id: Ida97aa5b695fd072ff354eeaa76c66cdef6995ef