OSDN Git Service

merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64
authorThe Android Automerger <android-build@google.com>
Sun, 18 May 2014 12:50:13 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 18 May 2014 12:50:13 +0000 (05:50 -0700)
commit6b6bc5f2e8f98faf4f26d184cf66f2ebe2f36eff
tree092739c3e50c926bf4c09b240f2ab7f4dc0e176b
parentb31f33b5e41bf295705b8f0c1582c6277e8fec64
parent5b1d492d267977ce3790b5754ae30465423df9c7
merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64