OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:33:15 +0000 (07:33 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:33:15 +0000 (07:33 -0800)
commit257fef430806408dbaca2708018b144d430fbdef
tree6fcdae64afb222c61a270f1cb7994c6ed7e7312d
parent0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792
parentd4382dd07eda339743aecd02c911431ffcdfff87
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911