OSDN Git Service

Reconcile with klp-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 22:10:41 +0000 (15:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 22:10:41 +0000 (15:10 -0700)
commit845dadec2a2cc619d316c44e706b15eba4d75293
tree0531ba39840bf4ffb2af5e35710d9e52c50ad7f3
parentc9178f709d67185ef87e886b3e7ab9a0cc10d023
parentf6dd662b2a4f66a9712a7e05cdb44acf4e61aa69
Reconcile with klp-release - do not merge

Change-Id: I7342697cd26413fe5da3528afca689e91a070c59