OSDN Git Service

resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)
committerAndreas Gampe <agampe@google.com>
Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)
commitfcc91b80ae77827726ab93d237f794f87b97a2e6
tree3fb49abf8e6eed4e8fd888b5233437015cc72292
parentb8eb3ad343be4fbef8b90225f52f4776303289be
parentbebee4fd10e5db6cb07f59bc0f73297c900ea5f0
resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp