OSDN Git Service

merge in master-release history after reset to 0e0122a9999eb1a603c99be12846acad29ed0593
authorThe Android Automerger <android-build@google.com>
Mon, 5 May 2014 12:50:11 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 5 May 2014 12:50:11 +0000 (05:50 -0700)
commit5292f57bbb041078577d227b9f1423623e338f06
treed30051beb05e80715609ffd0f57e38693c097ebd
parent0e0122a9999eb1a603c99be12846acad29ed0593
parenteab69d0c669fb574512393ab6d1e0c370ecad998
merge in master-release history after reset to 0e0122a9999eb1a603c99be12846acad29ed0593