OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 27 May 2013 14:50:36 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 27 May 2013 14:50:36 +0000 (07:50 -0700)
commit54cb0e84e999d45ee3f5fbae20c2c280aa4bfde9
tree9dc6d4cdb844eed787820ef57569f8e226b91238
parente0e1af0ac6a9f7382f4b3d807518b9844b4952bf
parentcb0b66efbd5cb37b5556e3d51afc45ac6a582ef0
merge in master-release history after reset to master