OSDN Git Service

resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Tue, 1 Apr 2014 18:47:16 +0000 (11:47 -0700)
committerBrian Carlstrom <bdc@google.com>
Tue, 1 Apr 2014 18:47:16 +0000 (11:47 -0700)
commit4888fe345306cd747b03757a01089683a2e6c922
treea8bd6f9afb52824bfc07521dac904ffeb3c4b7c7
parent31061ccfdaf01603dfdf20f15df8021d1c7d0b85
parentcece45d22652ca0d8a57a6cb03c5ca2a915a9a07
resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp

Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76