OSDN Git Service

merge in master-release history after reset to f218d8824388174af16b9cb08b1e6da34fcde750
authorThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:49:24 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:49:24 +0000 (05:49 -0700)
commitd527a8a755bc1e1f8b81a42613f27401e6ab7133
treea60d5aeddacef98561f5e0ee6a05434e9d8bdc76
parentf218d8824388174af16b9cb08b1e6da34fcde750
parentec1c9732f1a912336d8f06bad21dfea980f9cbbb
merge in master-release history after reset to f218d8824388174af16b9cb08b1e6da34fcde750