| commit | 5fcfca0cba49623f594a1cfc67b3407cd52ef46c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 26 01:02:21 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 26 01:02:25 2017 +0000 |
| tree | 5601c5a0e1f3acf8a2824d00f30b6a42a1e6fa5b | |
| parent | 6923028613f48bac846d373cda8e3d1cb2cd558c [diff] | |
| parent | e1c426f53c1792dd0ee1c80967539dd6ea84e816 [diff] |
Merge changes from topic 'am-d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp * changes: Merge changes from topic 'multinetwork_vndk' into oc-dev am: cffee96a16 Move libandroid_net from Android.mk to Android.bp. am: addb296226 -s ours