OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 20:08:57 +0000 (13:08 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 20:08:57 +0000 (13:08 -0700)
commit55b4ce54c703e6dcb1b9609e41363e85356dc481
tree10e06a1383d8ebf803e7ec395cb547c12ca7e81b
parent7c236a61c0c562e849304071da6e5857a2ff2c37
parent8651dc6544f46ef0dc001946c9606d53cb40cab9
merge from open-source master

Change-Id: Iad708bec6e3d604922c8fa8ea629af1e7fa42df9