OSDN Git Service

Merge "Rename options for shorter names." am: bc58b020c8 am: b4bfd7f529
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 24 Dec 2015 02:15:11 +0000 (18:15 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Dec 2015 02:15:11 +0000 (18:15 -0800)
am: 1db8c382e9

* commit '1db8c382e9ef69cbd80b7f538fb667fbc1d9d648':


Trivial merge