diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-15 09:54:30 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-15 10:01:12 -0700 |
| commit | e92372ba9eaa04eb4ed7eb9417ee2be3515bd972 (patch) | |
| tree | 043d28472868bd938ce7e0fa423dfe1ea1cf463d /include/cutils/multiuser.h | |
| parent | d7f78e88b5b2c65b8cef21fdcaae3278ec2ed083 (diff) | |
| parent | 2237ca4c6658d73c9fd21cb2fa10eeddff5708da (diff) | |
| download | system_core-e92372ba9eaa04eb4ed7eb9417ee2be3515bd972.zip system_core-e92372ba9eaa04eb4ed7eb9417ee2be3515bd972.tar.gz system_core-e92372ba9eaa04eb4ed7eb9417ee2be3515bd972.tar.bz2 | |
resolved conflicts for merge of 2237ca4c to jb-mr1-dev
Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
Diffstat (limited to 'include/cutils/multiuser.h')
0 files changed, 0 insertions, 0 deletions