Merge "Merge "Unit test for UidRange.java and UidRange.cpp" into nyc-dev am:...
Merge "Merge "Unit test for UidRange.java and UidRange.cpp" into nyc-dev am: 79c4dca2 am: 234ad519" into nyc-mr1-dev-plus-aosp
am: 4e247cff
* commit '4e247cff':
Change-Id: If49d613a57cbd5243fb16de04617c0f8472c01a9