OSDN Git Service

merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:42 +0000 (07:22 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:42 +0000 (07:22 -0700)
commitdf293f14f5bdb4f572c7f836ebb0802a177836ff
tree092739c3e50c926bf4c09b240f2ab7f4dc0e176b
parentb31f33b5e41bf295705b8f0c1582c6277e8fec64
parentbe320c8db93fa94767c32ba606653380bbed8abc
merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64