OSDN Git Service

am 0cad3b1b: Regenerate generated files (and build flock).
authorElliott Hughes <enh@google.com>
Tue, 6 Oct 2015 21:56:32 +0000 (21:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Oct 2015 21:56:32 +0000 (21:56 +0000)
* commit '0cad3b1b0742168cc6d6c342b566e660d009e5b8':
  Regenerate generated files (and build flock).

1  2 
Android.mk

diff --cc Android.mk
Simple merge