OSDN Git Service

Reconcile with klp-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 21:25:51 +0000 (14:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 21:25:51 +0000 (14:25 -0700)
commitc4cdd59e025e574a78c47bb6db83b31e46e66b04
tree8670495d220dc4956b4694387a74c247ef8eea61
parent9995bcbc820a2ef923dd77b0dfa100b754c9efe6
parent278640ca834e6a20b109b430ea4fd3209169f134
Reconcile with klp-release - do not merge

Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95