OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:54:26 +0000 (11:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:54:26 +0000 (11:54 -0800)
commit0c6fff72f78e4f80b28ccccac9584255591dd1a2
tree5e1848779de1d34de0adef83ab341a9ed08516fa
parent884e3bc29ed190a856f7562a73548868a7ecef2f
parent529cb9ed9c5d62d5b270cdd650380ae116382143
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00