OSDN Git Service

Merge "Add (duplicate) license from new XML file" am: 0a40cb3872 am: 67a13ffec9
authorNeil Fuller <nfuller@google.com>
Wed, 5 Apr 2017 14:20:01 +0000 (14:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 14:20:01 +0000 (14:20 +0000)
commitce5d47322bcbc0a85c9dbc32bc2881ebdc53d7ce
treecfbb8bfc9ae40ca53e3677f082487cb7d7a19170
parent4d5a66aaa31507f51b4be627644ea326efe139ae
parent7a8ee1fd6b1977313456c5fc3b90cda49b214f7e
Merge "Add (duplicate) license from new XML file" am: 0a40cb3872 am: 67a13ffec9
am: 7a8ee1fd6b

Change-Id: Ib3223563fa649749181958b7eb63ca8215aceb12