OSDN Git Service

am de1c33cd: Merge "Fix bug in removal of *.flock files." into mnc-dev am: f12e8b77c5
authorRichard Uhler <ruhler@google.com>
Mon, 11 Jan 2016 17:03:55 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 17:03:55 +0000 (17:03 +0000)
am: 0bf22b6192

* commit '0bf22b6192af6747004f90d8ad38e0d6cbea857a':


Trivial merge