[automerger skipped] Merge "Add apn data structure" into pi-dev am: dbf8a678ae
am: 89918e3209
-s ours
Change-Id: I9ba2c1d14a08a187ca702eeb49d0e884e8a6e93d
This commit is contained in:
dbf8a678ae
am: 89918e3209
-s ours
Change-Id: I9ba2c1d14a08a187ca702eeb49d0e884e8a6e93d