OSDN Git Service

resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 14 Nov 2013 01:50:35 +0000 (17:50 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Thu, 14 Nov 2013 01:50:35 +0000 (17:50 -0800)
commitd4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e
treee48570d73d77330f52520231337dff7f438ad134
parentc5f317e48e0406a0303eb1303cee4c5da2c6272d
parentec9e8933effe1dcb6887f7dca1cc0d78e6107e38
resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp

Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd