OSDN Git Service
Jason Monk [Thu, 9 Nov 2017 23:48:00 +0000 (18:48 -0500)]
Remove SliceView (its moving to support)
Test: manual
Bug:
68378561
Change-Id: I33b5a709da39c83e047e9005a20afc0ebde7f85f
Stefan Lafon [Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)]
Merge "Update statsd_config.proto."
TreeHugger Robot [Sun, 19 Nov 2017 04:58:53 +0000 (04:58 +0000)]
Merge "Fix a memory leak in LogEvent"
Yao Chen [Sun, 19 Nov 2017 02:56:52 +0000 (18:56 -0800)]
Fix a memory leak in LogEvent
My previous understanding of the liblog api was wrong. Luckily it
is caught in time. Also added a memory profiling tool in another CL.
Test: statsd_test
adb shell dumpsys meminfo
adb shell cmd stats meminfo
Change-Id: I742af2a38e52e35edf0d4c77ccc35ede7019a73b
Stefan Lafon [Sat, 18 Nov 2017 17:26:53 +0000 (09:26 -0800)]
Update statsd_config.proto.
Test: Ran statsd tests.
Change-Id: I3a83bdfb38be82d70ca547825152370df8bca9cc
TreeHugger Robot [Sat, 18 Nov 2017 23:46:35 +0000 (23:46 +0000)]
Merge "Don't just clear mPastBuckets when onDumpReport is called."
Yao Chen [Sat, 18 Nov 2017 22:14:38 +0000 (14:14 -0800)]
Don't just clear mPastBuckets when onDumpReport is called.
This needs to be done properly. Left a TODO.
Test: statsd_test
Change-Id: I8537f0a870ab82039e0822c69096784403ee1651
TreeHugger Robot [Sat, 18 Nov 2017 21:34:16 +0000 (21:34 +0000)]
Merge "Fix the unit test failure."
Yao Chen [Sat, 18 Nov 2017 20:03:42 +0000 (12:03 -0800)]
Fix the unit test failure.
Test: statsd_test
Change-Id: I7ab57d4eb8789523a2b435413fd35057602cc988
Howard Ro [Sat, 18 Nov 2017 18:39:16 +0000 (18:39 +0000)]
Merge "Resolve segfault when running send-broadcast command while statscompanion service is not connected"
Etan Cohen [Sat, 18 Nov 2017 18:11:31 +0000 (18:11 +0000)]
Merge "[AWARE] Add ranging API to discovery configuration"
Amith Yamasani [Sat, 18 Nov 2017 18:00:30 +0000 (18:00 +0000)]
Merge "Shorter thresholds for app standby"
TreeHugger Robot [Sat, 18 Nov 2017 04:37:45 +0000 (04:37 +0000)]
Merge "Allow "cmd package bg-dexopt-job" to take a list of package names"
TreeHugger Robot [Sat, 18 Nov 2017 04:36:47 +0000 (04:36 +0000)]
Merge "Converts exceptions to log messages in StatsManager."
TreeHugger Robot [Sat, 18 Nov 2017 03:50:01 +0000 (03:50 +0000)]
Merge "Use ProtoOutputStream's bytesWritten to properly estimate the size of EventMetricsData on memory"
Donald Chai [Sat, 18 Nov 2017 03:32:38 +0000 (03:32 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev am:
e7b0a330db
am:
f84b4204c3
Change-Id: I11183a5cd03103f7033379944ec762841d559d4a
Donald Chai [Sat, 18 Nov 2017 03:19:30 +0000 (03:19 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
am:
e7b0a330db
Change-Id: I7943dc35ceeca0c3fdb4df668a761889cd0add2d
TreeHugger Robot [Sat, 18 Nov 2017 03:03:19 +0000 (03:03 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
yro [Sat, 18 Nov 2017 01:20:45 +0000 (17:20 -0800)]
Use ProtoOutputStream's bytesWritten to properly estimate the size of
EventMetricsData on memory
Test: statsd, statsd_test
Change-Id: I6fc90c5d9303fe6cab582afb03c480969a6dc5a5
David Chen [Sat, 18 Nov 2017 01:44:33 +0000 (17:44 -0800)]
Converts exceptions to log messages in StatsManager.
We log if the statsd is not available instead of throwing an
exception. This helps prevent a crash when calling this API since
statsd is not a system service and can potentially be down.
Test: Not applicable.
Change-Id: I776efede4a01c751924fa9a8abd0eec0c4c1306b
TreeHugger Robot [Sat, 18 Nov 2017 01:42:24 +0000 (01:42 +0000)]
Merge "One more feature in DurationMetric -- nesting on top of Or and Max"
yro [Fri, 17 Nov 2017 23:44:48 +0000 (15:44 -0800)]
Resolve segfault when running send-broadcast command while
statscompanion service is not connected
Test: statsd, statsd_test
Change-Id: Ie98de1884f8d852c31c14db146d3da44cfc5aa8b
Arthur Eubanks [Fri, 15 Sep 2017 16:28:51 +0000 (09:28 -0700)]
Allow "cmd package bg-dexopt-job" to take a list of package names
Modify "cmd package bg-dexopt-job" to accept an optional list of
packages to run bg-dexopt on to help with testing.
Test: make && flashall && automated tests (ag/
2959616)
Test: adb shell cmd package bg-dexopt-job
Test: adb shell cmd package bg-dexopt-job pkg_name
BUG:
64807719
Change-Id: Ibf1fda88810dd4ec19fbbfe3322c35b201727707
Android Build Merger (Role) [Sat, 18 Nov 2017 00:49:57 +0000 (00:49 +0000)]
Merge "Merge "Update the comments for all CellIdentity*." am:
2610ad0556 am:
4f95fd8532 am:
06b73ece42"
TreeHugger Robot [Sat, 18 Nov 2017 00:48:34 +0000 (00:48 +0000)]
Merge "Support StatsD sending broadcasts."
Cassie [Sat, 18 Nov 2017 00:48:07 +0000 (00:48 +0000)]
Merge "Update the comments for all CellIdentity*." am:
2610ad0556 am:
4f95fd8532
am:
06b73ece42
Change-Id: I1b0d1af77cde5acea8218d2d7e3d92d6dd7ca846
Yipeng Cao [Sat, 18 Nov 2017 00:46:38 +0000 (00:46 +0000)]
Merge "Location Unit tests"
Cassie [Sat, 18 Nov 2017 00:39:17 +0000 (00:39 +0000)]
Merge "Update the comments for all CellIdentity*." am:
2610ad0556
am:
4f95fd8532
Change-Id: I8ee47862cb6651baae20a79360f7c0c9a94137cc
Amith Yamasani [Sat, 18 Nov 2017 00:35:44 +0000 (16:35 -0800)]
Shorter thresholds for app standby
Start off with slightly more aggressive timeouts to
switch between buckets. 12Hrs, 24Hrs and 48Hrs.
Bug:
63527785
Test: atest AppStandbyControllerTests
Change-Id: I4aa0cc38ef91538192eda0f48dd3840217aa49c4
Cassie [Sat, 18 Nov 2017 00:27:09 +0000 (00:27 +0000)]
Merge "Update the comments for all CellIdentity*."
am:
2610ad0556
Change-Id: I81f4e4a6bd0960ce3d2d51bfe15711a5c3eda9fb
Treehugger Robot [Sat, 18 Nov 2017 00:16:37 +0000 (00:16 +0000)]
Merge "Update the comments for all CellIdentity*."
TreeHugger Robot [Fri, 17 Nov 2017 23:24:04 +0000 (23:24 +0000)]
Merge "Implement Activity Manager Dumpsys --service option"
TreeHugger Robot [Fri, 17 Nov 2017 23:06:50 +0000 (23:06 +0000)]
Merge "Fix incorrect adb shell cmd help command for pull-source"
David Chen [Wed, 15 Nov 2017 22:20:04 +0000 (14:20 -0800)]
Support StatsD sending broadcasts.
StatsD will send a broadcast when we're 90% of the way to our
allocated memory limit for the configuration. If the memory usage
goes over the limit, we just lose all the data for this config.
Also modifies the adb shell commands to facilitate debugging of the
broadcasts.
Test: Manually tested on marlin-eng with custom gmscore code.
Change-Id: I517a15bd4c959aa221802f84a51f13141a725102
Nan Zhang [Fri, 17 Nov 2017 22:30:37 +0000 (22:30 +0000)]
Merge "Build fontchain_lint using python_binary_host" am:
7ecac139ea am:
7ade558ad2
am:
67695d3aff
Change-Id: I850304f79c1c35bfeb6951307b8ca2365da0330b
Etan Cohen [Wed, 8 Nov 2017 16:41:39 +0000 (08:41 -0800)]
[AWARE] Add ranging API to discovery configuration
Add mechanism to enable ranging as a condition for discovery:
- Publisher: enable ranging
- Subscriber: specify min and/or max range (which implicitly
enables ranging)
Add range (distance) information to the discovery message.
Bug:
33821639
Test: unit tests and basic (non functioning integration tests)
Change-Id: Ic50fb72a4a94e56c608ea47ec669f2b59354456f
Nan Zhang [Fri, 17 Nov 2017 22:20:57 +0000 (22:20 +0000)]
Merge "Build fontchain_lint using python_binary_host" am:
7ecac139ea
am:
7ade558ad2
Change-Id: Ie920005b39a476b281333b12fbed9e586a2ce3e7
TreeHugger Robot [Fri, 17 Nov 2017 22:20:11 +0000 (22:20 +0000)]
Merge "Check Settings.Global before sysprop in FeatureFlagUtils."
TreeHugger Robot [Fri, 17 Nov 2017 22:16:22 +0000 (22:16 +0000)]
Merge "statsd: parse the new format of stats log"
Cassie [Fri, 17 Nov 2017 22:16:01 +0000 (14:16 -0800)]
Update the comments for all CellIdentity*.
Bug:
63984327
Test: Basic telephony sanity
Change-Id: Icb9ba99cefb93a7c4a39cbc653ae046df8649cf9
Nan Zhang [Fri, 17 Nov 2017 22:12:58 +0000 (22:12 +0000)]
Merge "Build fontchain_lint using python_binary_host"
am:
7ecac139ea
Change-Id: I4fef971c8fc8837f73644667988ddc3e7f4305ec
Treehugger Robot [Fri, 17 Nov 2017 22:03:27 +0000 (22:03 +0000)]
Merge "Build fontchain_lint using python_binary_host"
TreeHugger Robot [Fri, 17 Nov 2017 21:53:01 +0000 (21:53 +0000)]
Merge "Minor comment and formatting cleanup"
TreeHugger Robot [Fri, 17 Nov 2017 21:41:59 +0000 (21:41 +0000)]
Merge "Follow-up for Ife38c2cd94ac9902911b005dbbca8b0d0a62e6d7"
yro [Fri, 17 Nov 2017 21:22:52 +0000 (13:22 -0800)]
Fix incorrect adb shell cmd help command for pull-source
Test: statsd should pass, but it's not required as it's just an update
in help instruction.
Change-Id: I36f4e4794ae8066abdeaac98db5e679a3bcf0a06
Cody Northrop [Fri, 17 Nov 2017 20:33:33 +0000 (20:33 +0000)]
Merge "Rootless GPU Debug"
TreeHugger Robot [Fri, 17 Nov 2017 20:24:41 +0000 (20:24 +0000)]
Merge "Apply PGO for all modules in hwui"
TreeHugger Robot [Fri, 17 Nov 2017 20:14:01 +0000 (20:14 +0000)]
Merge "fix the permission check crash in statsd."
Yi Jin [Mon, 30 Oct 2017 21:54:12 +0000 (14:54 -0700)]
Implement Activity Manager Dumpsys --service option
Bug:
66729158
Test: out/host/linux-x86/bin/incident_report -w amservices
Change-Id: I72015b9744bc8028001306283f169fca4797c700
Yao Chen [Tue, 14 Nov 2017 04:42:25 +0000 (20:42 -0800)]
statsd: parse the new format of stats log
+ Changed how we construct LogEvent, now it's based on the context from log_msg
without making a copy of the list.
+ All stats logs now have the same event tag, the atom id is the first elem in the log.
Test: statsd_test
Change-Id: I4419380f2ee1c2b2155d427b9f2adb78883b337f
Etan Cohen [Fri, 17 Nov 2017 19:53:01 +0000 (19:53 +0000)]
Merge "[RTT2] Disable VDBG"
Tyler Gunn [Fri, 17 Nov 2017 19:45:00 +0000 (19:45 +0000)]
Merge "Add missing } on @link tag." am:
31b0c6fb32 am:
80bfc216ca
am:
847acf2b9a
Change-Id: I012fa6fdd42edd4f9ee912ea990700ba3c60f2f0
Tyler Gunn [Fri, 17 Nov 2017 19:36:07 +0000 (19:36 +0000)]
Merge "Add missing } on @link tag." am:
31b0c6fb32
am:
80bfc216ca
Change-Id: Id241939f950517df7b09171913c958cdc6360a3b
Amith Yamasani [Fri, 17 Nov 2017 19:32:43 +0000 (19:32 +0000)]
Merge "Add a new usage event type for seen notification"
Tyler Gunn [Fri, 17 Nov 2017 19:27:12 +0000 (19:27 +0000)]
Merge "Add missing } on @link tag."
am:
31b0c6fb32
Change-Id: I2249cab4a50a9788cd8decb23fd8c60419ab6c21
Android Build Merger (Role) [Fri, 17 Nov 2017 19:26:40 +0000 (19:26 +0000)]
Merge "Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am:
3df706dcd9 am:
ea01b02f71 am:
5c1b92c512"
Adam Lesinski [Fri, 17 Nov 2017 19:25:28 +0000 (19:25 +0000)]
Merge "AAPT2: Fix debugging output"
Adam Lesinski [Fri, 17 Nov 2017 19:24:06 +0000 (19:24 +0000)]
Merge "AAPT2: Move all file output to FileOutputStream"
Fan Zhang [Fri, 17 Nov 2017 19:07:29 +0000 (11:07 -0800)]
Check Settings.Global before sysprop in FeatureFlagUtils.
Bug:
36222960
Test: atest
Change-Id: I731cb93596ca80e9b1a02478a8582d6488750f00
Cassie Han [Fri, 17 Nov 2017 19:23:00 +0000 (19:23 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am:
3df706dcd9 am:
ea01b02f71
am:
5c1b92c512
Change-Id: I139427f61310d568a51ece7297804e33b54fddaf
Tyler Gunn [Fri, 17 Nov 2017 19:13:53 +0000 (19:13 +0000)]
Merge "Add missing } on @link tag."
Ahmad Melegy [Fri, 17 Nov 2017 19:13:29 +0000 (19:13 +0000)]
Merge "Fix typo" am:
913f396c11 am:
8c7c6e3952
am:
9296c2c8c1
Change-Id: Idb98baf68132e27718c69d4b9a6bc22e8db77a0e
Cassie Han [Fri, 17 Nov 2017 19:12:52 +0000 (19:12 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am:
3df706dcd9
am:
ea01b02f71
Change-Id: I8871aeb7f3d1618883439df6f78f2d34955cc29e
Ahmad Melegy [Fri, 17 Nov 2017 19:04:55 +0000 (19:04 +0000)]
Merge "Fix typo" am:
913f396c11
am:
8c7c6e3952
Change-Id: Ieed26cd7bb6be66c6084dd0fc8f0dcc05d9156d0
Cassie Han [Fri, 17 Nov 2017 19:01:44 +0000 (19:01 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am:
3df706dcd9
Change-Id: I83ebfa9404af1b8045c6d9c7e8a3634469420adc
Ahmad Melegy [Fri, 17 Nov 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Fix typo"
am:
913f396c11
Change-Id: I244ccafe5bf76718cdc48b2fa7d9ce8270b0dd33
Cassie Han [Fri, 17 Nov 2017 18:47:59 +0000 (18:47 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Treehugger Robot [Fri, 17 Nov 2017 18:47:43 +0000 (18:47 +0000)]
Merge "Fix typo"
Yi Jin [Fri, 17 Nov 2017 18:44:15 +0000 (18:44 +0000)]
Merge "Expose how many bytes are written in ProtoOutputStream"
Pirama Arumuga Nainar [Fri, 17 Nov 2017 06:40:00 +0000 (22:40 -0800)]
Apply PGO for all modules in hwui
Bug: http://b/
65598278
Since hwui source files get statically linked into hwuimicro and
hwuimacro, we need to enable PGO for them (to instrument and collect
profiles). For consistency, apply PGO to all hwui modules (including
the unit tests) so we test the actual build configuration for libhwui.
For now, we don't use any profile so this CL affects the build only when
instrumentation is turned on using 'ANDROID_PGO_INSTRUMENT=hwui'.
Test: Build with ANDROID_PGO_INSTRUMENT=hwui, run hwuimacro and
hwuimicro and verify profile generation
Change-Id: I9d35953d544e0ccc180eb164ff53466239194c0f
Qing Xia [Fri, 17 Nov 2017 18:29:57 +0000 (18:29 +0000)]
Merge "Fix Gravity toString wrong message issue"
Tobias Thierer [Fri, 17 Nov 2017 18:25:24 +0000 (18:25 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework."
Yao Chen [Fri, 17 Nov 2017 17:44:40 +0000 (09:44 -0800)]
fix the permission check crash in statsd.
And change the fake config uid to be 1000, so we can dump it from the test app.
Test: manual
Change-Id: I99b4cd28b351add8cf3e315e1dccf8cf511a0be8
tccyp [Wed, 15 Nov 2017 18:51:53 +0000 (10:51 -0800)]
Location Unit tests
- Added the GnssStatus unit test
- Upgraded the runner to AndroidJunitRunner
- Removed the old non-working unit tests.
To run the tests, use any of this:
1. runtest frameworks-location
2. forrest test FrameworksLocationTests
Bug:
69375757
Test: runtest frameworks-location
Change-Id: Ia52a8ce51ab9334ad1b8dd1686303270ceca270b
Nan Zhang [Thu, 9 Nov 2017 04:48:46 +0000 (20:48 -0800)]
Build fontchain_lint using python_binary_host
Test: out/host/linux-x86/bin/fontchain_lint
out/target/product/generic/system true external/unicode
Bug: b/
27727331
Change-Id: Ib9353d2338c3b939027069f49e3e847c65526581
Peter Visontay [Fri, 17 Nov 2017 17:04:29 +0000 (17:04 +0000)]
Merge "Add a link to the PackageInstaller API demos."
Tyler Gunn [Fri, 17 Nov 2017 16:36:41 +0000 (08:36 -0800)]
Add missing } on @link tag.
Test: Compiled code (this is a non-code change).
Bug:
69439905
Change-Id: I334ef7d74ac9802378b43a8f95979dcaf82c592f
Tobias Thierer [Fri, 17 Nov 2017 15:21:49 +0000 (15:21 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}."
Peter Visontay [Fri, 17 Nov 2017 14:00:47 +0000 (14:00 +0000)]
Add a link to the PackageInstaller API demos.
Test: Ran "make docs".
Change-Id: I8459bc2a4aaf3827f71a6af5478ff0f30fae6dc3
Cody Northrop [Fri, 20 Oct 2017 15:03:13 +0000 (09:03 -0600)]
Rootless GPU Debug
Add the ability to load GPU debug layers from the base
directory of debuggable applications.
This commit:
* Adds a new Setting to Developer options: "Enable GPU debug layers"
* Adds a new way to discover and specify GPU debug layers per app
* Moves much of the layer enabling logic into GraphicsEnvironment
* Removes the JNI component of ApplicationLoaders
Bug:
63708377
Test: Manual, CTS tests to follow
Change-Id: I7d33e9f835f49aa8d86e63bdb32037728bc8b6a4
TreeHugger Robot [Fri, 17 Nov 2017 05:32:56 +0000 (05:32 +0000)]
Merge "Drop the second unit from elapsed time if zero"
TreeHugger Robot [Fri, 17 Nov 2017 05:07:54 +0000 (05:07 +0000)]
Merge "Adds CHRE platform ID to ContextHubInfo"
Calin Juravle [Fri, 17 Nov 2017 03:04:52 +0000 (03:04 +0000)]
Merge "Workaround to get passed the broken install flow" am:
b0e6508a5b am:
af657ae978
am:
a6b3dc3c42
Change-Id: I359059c4b96248aba45843acf7bff31ecc37b841
Calin Juravle [Fri, 17 Nov 2017 02:55:15 +0000 (02:55 +0000)]
Merge "Workaround to get passed the broken install flow" am:
b0e6508a5b
am:
af657ae978
Change-Id: I57ba9c85e4d5b4e301cb14ba068430c4454a4978
Arthur Ishiguro [Thu, 2 Nov 2017 18:30:41 +0000 (11:30 -0700)]
Adds CHRE platform ID to ContextHubInfo
Adds a parameterized constructor and the platform ID to the
ContextHubInfo.
Bug:
67734082
Test: make update-api && make from root
Change-Id: I98822f625c5173cdbd281b24550de434b67b18d3
Calin Juravle [Fri, 17 Nov 2017 02:46:57 +0000 (02:46 +0000)]
Merge "Workaround to get passed the broken install flow"
am:
b0e6508a5b
Change-Id: Icbad0d985b4d8d3e206ee5e426cdd1f58955aec1
Jack He [Fri, 17 Nov 2017 02:40:58 +0000 (02:40 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener" am:
8055aec0da am:
a3185b2ff2
am:
e778568995
Change-Id: I2cd2414e591fc224364fc286696d910a1ab0b710
TreeHugger Robot [Fri, 17 Nov 2017 02:36:55 +0000 (02:36 +0000)]
Merge "Make ripples silky smooth"
Calin Juravle [Fri, 17 Nov 2017 02:36:29 +0000 (02:36 +0000)]
Merge "Workaround to get passed the broken install flow"
Jack He [Fri, 17 Nov 2017 02:29:10 +0000 (02:29 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener" am:
8055aec0da
am:
a3185b2ff2
Change-Id: Iaa074f6d99742605537c9f406c848a470c2c777c
Jack He [Fri, 17 Nov 2017 02:19:02 +0000 (02:19 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
am:
8055aec0da
Change-Id: If1757262ce5da5f2ab1055cfb238ea570550f7f7
Howard Ro [Fri, 17 Nov 2017 02:16:07 +0000 (02:16 +0000)]
Merge "Write statsd configuration to disk and add cmd to clear it"
TreeHugger Robot [Fri, 17 Nov 2017 02:13:07 +0000 (02:13 +0000)]
Merge "Revert "Implement front-end APIs for generic vendor-specific parameters.""
Treehugger Robot [Fri, 17 Nov 2017 02:10:07 +0000 (02:10 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
Jakub Pawlowski [Fri, 17 Nov 2017 01:58:04 +0000 (01:58 +0000)]
Merge "Add getProfileParentId (1/2)" am:
7a2c66359a am:
b6946d8563
am:
447e453e58
Change-Id: Idd087f45d5fba325f347a8bb0391745ccd0593a0
Jakub Pawlowski [Fri, 17 Nov 2017 01:48:14 +0000 (01:48 +0000)]
Merge "Add getProfileParentId (1/2)" am:
7a2c66359a
am:
b6946d8563
Change-Id: I3fe6f4300c9321fc57479fc4a9e952d2aa0c73cc
TreeHugger Robot [Fri, 17 Nov 2017 01:46:18 +0000 (01:46 +0000)]
Merge "Remove one legacy install path"
Jakub Pawlowski [Fri, 17 Nov 2017 01:40:05 +0000 (01:40 +0000)]
Merge "Add getProfileParentId (1/2)"
am:
7a2c66359a
Change-Id: Iea965e42bb79f939381971e8dd9466b824606ee0
Jakub Pawlowski [Fri, 17 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Add getProfileParentId (1/2)"
Adam Lesinski [Fri, 17 Nov 2017 00:58:02 +0000 (16:58 -0800)]
AAPT2: Fix debugging output
Test: manual
Change-Id: I3a362caf7bd691df399db00c6280e0a208a406da