tree a1692544f8e926f65f4c69cf23460a320ed4f549
parent 9ca478b6c30472964cf06c0e7917d6df817d2d97
parent 9b4725d0716c8bd14e087e34bd32b981111ce553
author Andreas Gampe <agampe@google.com> 1467835364 +0000
committer android-build-merger <android-build-merger@google.com> 1467835364 +0000

Merge \\"Frameworks/base: Refactor UserHandle and Environment a bit\\" into nyc-mr1-dev am: e6fcebbf50
am: 9b4725d071

Change-Id: I2c6c65c9e1445e02c8e0e264090cbb4d62295d39