OSDN Git Service

resolved conflicts for merge of 804b95e5 to klp-modular-dev-plus-aosp
authorPaul Jensen <pauljensen@google.com>
Thu, 3 Apr 2014 23:59:27 +0000 (19:59 -0400)
committerPaul Jensen <pauljensen@google.com>
Thu, 3 Apr 2014 23:59:27 +0000 (19:59 -0400)
commitc8167111d57992b8ce3ca554a9499973c55aa174
treee180dd6db5e8e1fe56833f361134a15fab18f8c8
parentc48efe35885c203e0d40abc81ae40579178ab90e
parent804b95e5356a9fbb075c528fb781dd99a3be7277
resolved conflicts for merge of 804b95e5 to klp-modular-dev-plus-aosp

Change-Id: I124e9342acdb0c9cf0cdcae31f063787c96ab6e2