Chenbo Feng 9313f7adf9 Merge "Clean up the permission control code in framework" am: 0e6d2b5f4f ...

am: 6cb0c1579d

Change-Id: I1af059171c5d80be7abaee636f012f3b55dac2df

2019-05-13 11:32:59 -07:00

..

android

Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." am: 3bee1cdc4e

2019-05-10 08:45:30 -07:00

com/android

Merge "Clean up the permission control code in framework" am: 0e6d2b5f4f

2019-05-13 11:32:59 -07:00