OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
commit2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6
treef5d7b5a06cd58cfc7c7bfa2acfae16f5278644b1
parentcb3911d30c515e06fbea0000af02fa3d09688943
parenta71766561fb4b411dc977377f73283e6ab410d07
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81