tree 779bd93975c7dd435da521ff6d6937466e43a8a0
parent 6655630c962c68e5ca510f4d3249d00e819336f8
parent 68457b9cd49a695ed50c51eb9c0d0b63fcead737
author Todd Kennedy <toddke@google.com> 1445461182 +0000
committer android-build-merger <android-build-merger@google.com> 1445461182 +0000

Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf am: d12f298da4 am: c9f3b2f54b
am: 68457b9cd4

* commit '68457b9cd49a695ed50c51eb9c0d0b63fcead737':
  Maintain shared user list on OTA