OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 8 May 2013 14:49:56 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 8 May 2013 14:49:56 +0000 (07:49 -0700)
commitbcc2c8146c711baa821f97e8c62fed79a04809ce
tree6dc444d7f05aa0512e3c97344d86ee0264daf869
parent002e1e58dfe19dd3e49a59c6827cbf51573941a2
parent6f9707411921c72255dfa8b6ba26e7758de10ef6
merge in master-release history after reset to master