OSDN Git Service

Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc...
authorAndre Eisenbach <eisenbach@google.com>
Tue, 10 May 2016 15:40:18 +0000 (15:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 15:40:18 +0000 (15:40 +0000)
commitd8052dba06730b3169bcc7cacbf7e56fcd61b312
tree484575bd69307473feccd4eb471b3d8bfe908a93
parent1be497ad84b5465bc0588518ff452f41c6ae1aaa
parenta72dc32ec8381be813857d7b8f40dd1cecd857ca
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am: bd48fd98ad am: 9c32e564df am: 1c3f2f19e6  -s ours
am: a72dc32ec8

* commit 'a72dc32ec8381be813857d7b8f40dd1cecd857ca':
  DO NOT MERGE Add ability to add interop entries dynamically (2/2)

Change-Id: I811c3e0281e19685b5b7cf364a141aee083c8f3f