OSDN Git Service

am de1c33cd: Merge "Fix bug in removal of *.flock files." into mnc-dev am: f12e8b77c5
authorRichard Uhler <ruhler@google.com>
Mon, 16 Nov 2015 16:25:56 +0000 (16:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Nov 2015 16:25:56 +0000 (16:25 +0000)
am: b39ab48964

* commit 'b39ab48964737e72db4142ad9596df73ee553623':


Trivial merge