OSDN Git Service

resolved conflicts for merge of 01632399 to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000 (10:58 -0700)
committerDan Albert <danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000 (10:58 -0700)
commit14aa7ca20da58d250ad6de31799253146b91ccc6
treeba621f85d805040f1b683751bf5e40a61974f386
parentb33d890873b1a6079737d312877e0012d9bc7734
parent016323997e90e8bf217b77bd6c318b5c6268078f
resolved conflicts for merge of 01632399 to lmp-dev-plus-aosp

Change-Id: I7744ba85e1964926532f4327ffbc8dcef3c85891