OSDN Git Service

Merge "Removing bogus file added by mistake" am: a44c833042
authorHugo Benichi <hugobenichi@google.com>
Fri, 9 Dec 2016 11:02:54 +0000 (11:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 11:02:54 +0000 (11:02 +0000)
commitaccb2854d1037703d82167af5c4393e628835e87
treeaac301fe2e89be5d8bef4007bfbe97d0fcc61252
parentb2d7fe1f2269d8eee0d1aa0f2e6a5734e52a8969
parent4180078d0df0ef7205847d03f07fd7c160dbd1e2
Merge "Removing bogus file added by mistake" am: a44c833042
am: 4180078d0d

Change-Id: I9da22da1fe2458162768ddf33f42eb9e8b7f974e