OSDN Git Service

resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp
authorKenny Root <kroot@google.com>
Wed, 18 Mar 2015 17:26:11 +0000 (10:26 -0700)
committerKenny Root <kroot@google.com>
Wed, 18 Mar 2015 17:26:11 +0000 (10:26 -0700)
commit61ecb53e73747b6400ba1cc2ffa2877c32a68fcd
treec6c28ccf7cd9479fc7b81843afd298931d8b6f73
parent3b419c0f5c870960b11c9fde81e9eb8ea8976aad
parentfb9ff42d7401d0a2c58140fe306460852ea51167
resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp

Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2