| commit | d4acc87df2c2d77b6687ebd2ba1429b0df3e965e | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Thu Mar 09 21:41:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 09 21:41:56 2017 +0000 |
| tree | f7fdbfd54642fb72edcb274dd260cc1e3e05ddc2 | |
| parent | 68899adbb98b1065d02c99819b5996a1d7a836a3 [diff] | |
| parent | d956f2f7f5d7a5ec536e0161f5822b356a336315 [diff] |
Merge "Support both locations for seapp/service contexts" am: 7f9242fd48 am: f06d40eed2 am: d956f2f7f5 Change-Id: Ia041c01f7c29fffc3cea9bd04cbffcd8f7b1e243