tree 9a219d9ca6991b7a11c1c62efbba695187190071
parent f063033a9123a7e8d9235ec549b3ce3dff1dc5c9
parent 4a7d498e2ff0ee58112710c04f284a24a3f88cd2
author Mark Salyzyn <salyzyn@google.com> 1460390473 +0000
committer android-build-merger <android-build-merger@google.com> 1460390473 +0000

Merge "liblog: remove android_ids and replace with getpwuid" am: f7040c8
am: 4a7d498

* commit '4a7d498e2ff0ee58112710c04f284a24a3f88cd2':
  liblog: remove android_ids and replace with getpwuid

Change-Id: Idb750dd8944807cc14c265b388e2c058e17bbe53