OSDN Git Service

resolved conflicts for merge of 495541b1 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Sat, 23 Aug 2014 06:13:45 +0000 (23:13 -0700)
committerAndreas Gampe <agampe@google.com>
Sat, 23 Aug 2014 06:13:45 +0000 (23:13 -0700)
commitf29a7f1a47141b1394c82f59d9d3f1c4661a52e3
tree38f204bcad6f89305db6defe4e667721e973091f
parent37b318cbc561c0920844a8c0e17c05deba740c32
parent495541b1954003360ffdeb2376ccf638b942e0ce
resolved conflicts for merge of 495541b1 to lmp-dev-plus-aosp

Change-Id: I2cd82b1a6976983f5042d846e92dd03b2de66203