tree 6852314e51232ea89bfab744c35e339abb03cc1e
parent 949ea1442925cbbce72ccff1b0ffc7c7f876e97b
parent c9f3b2f54b042df97a806ad114f21cca26a8341a
author Todd Kennedy <toddke@google.com> 1445460751 +0000
committer android-build-merger <android-build-merger@google.com> 1445460751 +0000

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

* commit 'c9f3b2f54b042df97a806ad114f21cca26a8341a':
  Maintain shared user list on OTA