OSDN Git Service

resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp
authorMingyao Yang <mingyao@google.com>
Wed, 30 Jul 2014 04:47:26 +0000 (21:47 -0700)
committerMingyao Yang <mingyao@google.com>
Wed, 30 Jul 2014 04:47:26 +0000 (21:47 -0700)
commitf3fc5a6d29cf7cadc0ac1bd4567042aac27ec543
treeacb71cf90f57a28176ff5cc050cb55a30ee5023a
parent4b8fb144c790ccfa7556d2c4bda143d3725d5d9c
parente19f2b00eebd61e73761ab531866654f08968711
resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp

Change-Id: I678a541f0bcef726db44ccb50cb6feb71ec498e5