Commit Graph
446 Commits
Author SHA1 Message Date
Treehugger Robot 4e3db63e41 Merge "Fix SMS status handling" 2019-06-12 00:18:44 +00:00
Treehugger Robot aa5bde8dbe Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" 2019-06-12 00:12:16 +00:00
Taesu Lee 6c3770a7ea Fix wrong PreferenceCategory for SMS delivery report
Test: Manual

Change-Id: I3008c596e5559e51613ed2da43793187c79381f5
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-05-31 14:54:31 +09:00
Raman Tenneti 1e56062ac9 Merge "Messaging: Fix generating id in android namespace" 2019-05-23 22:26:29 +00:00
Raman Tenneti 5ecd041b36 Merge "AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4. + Added AndroidTest.xml + Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf."
am: 90079b43ab

Change-Id: I44e82b085ca5d8ac45b41e3649d8fa985e76eeb5
2019-04-24 19:38:42 -07:00
Raman Tenneti 90079b43ab Merge "AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4. + Added AndroidTest.xml + Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf." 2019-04-25 02:28:48 +00:00
Raman Tenneti a3b82b5fff AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk.
+ Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4.
+ Added AndroidTest.xml
+ Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf.

Bug: 126516784

Test: make messagingtests and tested the messaging UI manually. Ran the following CTS tests on Pixel phone.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 8529760 Mar  8 16:46 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Mar 13 14:22 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  ...
  Results from tests that require device:

  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

  All tests passed!

acloud test
-----------
$ lunch aosp_cf_x86_phone-userdebug

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 10585182 Mar 15 15:19 ./target/product/vsoc_x86/system/app/messaging/messaging.apk
$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 643697 Mar 15 15:57 ./target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ acloud reconnect
$ adb devices
  List of devices attached
  127.0.0.1:52761	device

$ adb install -r -d out/target/product/vsoc_x86/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ cd packages/apps/Messaging
$ atest messagingtests -- --abi x86 --serial 127.0.0.1:52761

Change-Id: I6b1143db6c596805f3c48f310323e0e02d344d00
2019-04-24 22:32:45 +00:00
Raman Tenneti d27676a25a AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug
am: c10a188d5c

Change-Id: Ie2e02b3f52c5b6fd6b8cf4a37ece4ac63c8b0fef
2019-04-17 12:52:53 -07:00
Raman Tenneti c10a188d5c AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug
BUG: 126516784

Test: No impact. TEST_MAPPING wasn't enabled before, thus removing the file shouldn't have an impact.
Change-Id: Ib206cb6d921b59a032e6557352c6961310b08272
2019-04-17 10:24:20 -07:00
Colin Cross dbf9e67132 Update messaging for guava 27.1
am: 485b019679

Change-Id: I39ed624add43b2c1d0a2ecb6d75fad7c091bd7b2
2019-04-16 16:34:50 -07:00
Colin Cross 485b019679 Update messaging for guava 27.1
CharMatcher.ASCII has been replaced with CharMatcher.ascii().

Bug: 130306229
Test: m checkbuild
Change-Id: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e
Merged-In: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 63cffd0246)
2019-04-15 21:45:16 -07:00
Raman Tenneti 315d8d3f70 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made. Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null".
am: 8e71d1b707

Change-Id: Iaca20ad962131fa5629b77789e9e853c6f0b39ce
2019-04-07 11:35:14 -07:00
Raman Tenneti 8e71d1b707 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made.
Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null".

Bug: 130046636

Test: manual - Tested the messaging UI. Ran the following CTS tests on Pixel phone.

$ make -j 40
$ make messagingtests -j
$ find out -name "messaging*.apk" -print -exec ls -l {} \;
  -rw-r--r-- 1 rtenneti primarygroup 8529760 Apr  5 18:50 out/target/product/marlin/system/app/messaging/messaging.apk
  -rw-r--r-- 1 rtenneti primarygroup 729713 Apr  5 18:54 out/target/product/marlin/testcases/messagingtests/arm64/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/marlin/testcases/messagingtests/arm64/messagingtests.apk

$ adb shell am instrument -w com.android.messaging.test
  Time: 12.766
  OK (113 tests)

CTS tests for Mesaging app
---------------------------
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/NotificationTest.java
  adb  shell am instrument -e class 'android.app.cts.NotificationTest' -w 'android.app.cts/androidx.test.runner.AndroidJUnitRunner'
  android.app.cts.NotificationTest:...........................
  Time: 0.2
  OK (27 tests)

atest
-----
$ cd packages/apps/Messaging
$ atest
  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

Change-Id: Ic263e2c63d675c40a2cfa1ca0a8776c8e2b510b9
2019-04-05 19:04:14 -07:00
Raman Tenneti 4909a68c63 Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"."
am: 7d08344e9b

Change-Id: I718abce9535d773fb02bf23e63b555e47a31c410
2019-03-22 13:35:40 -07:00
Raman Tenneti 7d08344e9b Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"."
This reverts commit bada9f9b46.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I17281de5c14e7c285d263729167f208cbea4f7d5
2019-03-22 18:08:22 +00:00
Taesu Lee 4b1c6eb2c9 Fix SMS status handling
Simple matching up CDMA status with GSM TP-Status for common handling.
And fix bugleStatusForSMS() for all the permanent error cases.

Note: Need to check SC operation for ERROR_TEMPORARY.
Test: Manual

Change-Id: Ic8136d273dc0c25a4f0690f951d4d8aca20579ff
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-03-15 16:22:48 +09:00
Taesu Lee 87811542d0 Fix X-Mms-Transaction-ID of M-Acknowledge.ind
X-Mms-Transaction-ID of M-Acknowledge.ind should be set as the
corresponding M-Retrieve.conf's transaction ID instead of
M-Notification.ind's one.
(OMA-TS-MMS_ENC-V1_3-20110913-A)

Test: Manual

Change-Id: I250f32b93cdfbed815206543df5486efa4df18eb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-03-13 12:16:09 +09:00
Michael Bestas a6accb4a53 Messaging: Fix generating id in android namespace
Fixes:
res/layout/apn_preference_layout.xml:40: warn:
generated id 'android:id/title' for external package 'android'.
res/layout/apn_preference_layout.xml:48: warn:
generated id 'android:id/summary' for external package 'android'.

Change-Id: Ia096fa2e072ba4391e3adad52d3f9c9abed0e976
2019-03-03 16:23:45 +02:00
Raman Tenneti 62f573f1ef AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test".
am: bada9f9b46

Change-Id: I9e4443ddc278dd1f5bb3cd42dac451578538e2f8
2019-02-27 14:52:28 -08:00
Raman Tenneti bada9f9b46 AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test".
+ Added keepclass ContactPickerFragment to fix the following exception.
  Caused by: java.lang.ClassNotFoundException: Didn't find class "com.android.messaging.ui.contact.ContactPickerFragment"

Bug: 126516784

Test: make messagingtests and tested the messaging UI manually. Ran the following CTS tests on Pixel phone.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 8624061 Feb 27 10:55 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Feb 27 10:33 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk

$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb shell am instrument -w com.android.messaging.test
  Time: 13.18
  OK (113 tests)

CTS tests for Mesaging app
---------------------------
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/NotificationTest.java
  android.app.cts.NotificationTest:...........................
  Time: 0.263
  OK (27 tests)

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  messagingtests: Passed: 113, Failed: 0, Ignored: 0
  All tests passed!

Change-Id: I559b25aeb536489478fb3511b611e76da1891874
2019-02-27 11:08:03 -08:00
Xin Li bb9b93a2a6 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I1fbc854ec297abc3f113f2650567f27de8623d73
2019-02-20 16:19:39 -08:00
Raman Tenneti b966c435c6 AOSP/Messaging - update the Messaging version to target P (28) or higher. Use JobIntentService to start the Backgroundworkerservice and ActionServiceImpl services.
am: cdf40bb061

Change-Id: Id2cc2258a1cf787dad7238496d54cd6a2419b951
2019-02-20 03:08:29 -08:00
Raman Tenneti cdf40bb061 AOSP/Messaging - update the Messaging version to target P (28) or higher.
Use JobIntentService to start the Backgroundworkerservice and
ActionServiceImpl services.

+ Deleted WakeLock code.
+ Made changes to com.android.messaging.test tests so that all tests
  pass with the new JobService. I am not sure if these tests passed
  before these changes.
+ CTS tests passed without any changes.
+ Added TEST_MAPPING file for presubmit tests.

Bug: 115499280
Bug: 119503204

Test: manual - Tested the messaging UI. Ran the following CTS tests on Pixel phone.

$ make -j 40
  rw-r--r-- 1 rtenneti primarygroup 8624061 Feb 19 12:37 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Feb 19 12:52 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk

$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb shell am instrument -w com.android.messaging.test
  Test results for InstrumentationTestRunner=...........
  Time: 13.353
  OK (113 tests)

CTS tests for Mesaging app
---------------------------
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/NotificationTest.java
  android.app.cts.NotificationTest:...........................
  Time: 0.299
  OK (27 tests)

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  Running Tests...
  messagingtests (113 Tests)
  -------------------------
  ...
  [113/113] com.android.messaging.util.YouTubeUtilTest#testGetYoutubePreviewImageLink: PASSED (2ms)

  Results from tests that require device:

  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

  All tests passed!

Change-Id: I9494f0750954e6364abb695aa867494669ae54c4
2019-02-19 14:52:18 -08:00
Aurimas Liutikas 2310d69876 Migrate Messaging to androidx.
am: 1b693ea7df

Change-Id: Ib82fc411e687738b85c96259765ec170c245b4bd
2019-02-19 11:33:00 -08:00
Aurimas Liutikas 1b693ea7df Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
Merged-In: I9103450622f129311545648ac75f5b2f9fc2d04a
2019-02-14 22:59:57 +00:00
calvinpan f465b8039c Migrate to TelephonyProvider new URI when query the current sim APN
am: 7ea2a930be

Change-Id: If086c0216d9e5b38aceff01277b103b8d6a10ced
2019-01-18 17:05:19 -08:00
calvinpan 7ea2a930be Migrate to TelephonyProvider new URI when query the current sim APN
Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and
query based on SIM_APN_URI will return all matching APNs from current
subscription carrier, so migrate to the new URI.

Bug: 115709816
Test: Build pass.
Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc
Merged-In: I260f2da2677564f37ef6a7711d45040a61215ddc
2019-01-18 03:25:55 +00:00
Dan Willemsen 8c1ff04763 Replace USER with BUILD_USERNAME am: 88c7bd15a8
am: e0f4749cb7

Change-Id: I485aa7366ebf2443152a28c957dc377f57b642e8
2019-01-11 11:13:42 -08:00
Zach Riggle 7cca9ba4fd Fix 'date' so that it does not cause regeneration for unbundled builds am: a48eac716c
am: 7154309624

Change-Id: I9a177486d2feaa409656244e7e856396227581ef
2019-01-11 11:13:34 -08:00
Dan Willemsen e0f4749cb7 Replace USER with BUILD_USERNAME
am: 88c7bd15a8

Change-Id: Ia06610aac9728d4aedbb570f47e505e363a37e45
2019-01-11 10:54:05 -08:00
Zach Riggle 7154309624 Fix 'date' so that it does not cause regeneration for unbundled builds
am: a48eac716c

Change-Id: I8486eeafeb6e3c6de1e6a83a50bb159ea5a03ff8
2019-01-11 10:54:00 -08:00
Dan Willemsen 88c7bd15a8 Replace USER with BUILD_USERNAME
USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have
the original value in all cases.

Bug: 122270019
Test: none
Change-Id: Id7122113f1764cb2e676e96e255f47675f831f83
2019-01-10 17:16:24 -08:00
Zach Riggle a48eac716c Fix 'date' so that it does not cause regeneration for unbundled builds
Currently a 'tapas' build will regenerate each time with:

    $(shell date +%m%d%y_%H%M%S) was changed, regenerating...

Change-Id: I2eeda1e9dd51a56bf0783f427b4fcf5a1f489254
Merged-In: I2eeda1e9dd51a56bf0783f427b4fcf5a1f489254
2019-01-10 17:16:18 -08:00
Chih-Hung Hsieh f1ee096503 Correct some errors in owners list. am: ebf6b1c285
am: b24a7af8e2

Change-Id: Ib37f9932464718b0cacaf01dec06a3eda494637f
2019-01-09 12:14:30 -08:00
Chih-Hung Hsieh b24a7af8e2 Correct some errors in owners list.
am: ebf6b1c285

Change-Id: I92e0e55b96258bbdea5efb370bd55a1f8a126f48
2019-01-09 12:10:33 -08:00
Chih-Hung Hsieh ebf6b1c285 Correct some errors in owners list.
Bug: 33166666
Test: gerrit uploader
Change-Id: I2483e2afc4f6c89e7b59095b950160ffa4c7c874
2019-01-09 09:43:14 -08:00
Chih-Hung Hsieh 79a7e2dc9a Add default code reviewers into OWNERS am: 40ad6823a7
am: 55327087cd

Change-Id: I9eb950d88b720fb85a52647a532843dd40d2e5d7
2019-01-08 14:14:47 -08:00
Chih-Hung Hsieh 55327087cd Add default code reviewers into OWNERS
am: 40ad6823a7

Change-Id: I0c95cc57941669765d49010475631acc8825426e
2019-01-08 14:11:41 -08:00
Chih-Hung Hsieh 40ad6823a7 Add default code reviewers into OWNERS
Bug: 33166666
Test: gerrit uploader
Change-Id: I6f35e1234694c4ac91b77bbbb9acd0da7ea80cba
2019-01-08 11:36:29 -08:00
Xin Li f531c6dc79 [automerger skipped] DO NOT MERGE am: c020ac4b78 -s ours
am: ae78a1a65e  -s ours

Change-Id: I89fb7af89188f9d046e082a998f0c69875de283a
2018-12-10 11:13:17 -08:00
Xin Li ae78a1a65e [automerger skipped] DO NOT MERGE
am: c020ac4b78  -s ours

Change-Id: I0e13b090f2aa21482afcf798333e20441fae0873
2018-12-10 10:10:14 -08:00
Xin Li c020ac4b78 DO NOT MERGE
Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Id931c19bd78c83aa24c821f12691f92925fdafbe
2018-12-07 16:14:49 -08:00
Raman Tenneti c284495bbd AOSP/Messaging - updated tests target version to 24 to match the Messaing app's targetSdkVersion. All messagingtests tests pass/work. + ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification. + GetOrCreateConversationActionTest - changed the blankId assert to assertEquals because 10 conversations were inserted when database was created. + ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument. am: c188adbeaa
am: a7f76f672a

Change-Id: Ic8af9d69b14a370036c0e4be910a586ec2c63bd9
2018-12-04 00:05:29 -08:00
Raman Tenneti a7f76f672a AOSP/Messaging - updated tests target version to 24 to match the Messaing app's targetSdkVersion. All messagingtests tests pass/work. + ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification. + GetOrCreateConversationActionTest - changed the blankId assert to assertEquals because 10 conversations were inserted when database was created. + ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument.
am: c188adbeaa

Change-Id: I652736cfaf848775fbbf09b8f393a5b381b5b78b
2018-12-03 23:58:01 -08:00
Raman Tenneti c188adbeaa AOSP/Messaging - updated tests target version to 24 to match the Messaing app's targetSdkVersion. All messagingtests tests pass/work.
+ ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification.
+ GetOrCreateConversationActionTest - changed the blankId assert to assertEquals because 10 conversations were inserted when database was created.
+ ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument.

Bug: 119503204

Test: manual - Ran the following CTS tests on Pixel phone. Tested the messaging UI.

$ make -j 40

$ make messagingtests -j

$ ls -l out/target/product/marlin/system/app/messaging/messaging.apk
  -rw-r--r-- 1 rtenneti primarygroup 8974412 Dec  3 17:21 out/target/product/marlin/system/app/messaging/messaging.apk

$ ls -l  out/target/product/marlin/testcases/messagingtests/messagingtests.apk
  -rw-r--r-- 1 rtenneti primarygroup 709233 Dec  3 17:25 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk

$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb shell am instrument -w com.android.messaging.test
  Test results for InstrumentationTestRunner=.........................................
  Time: 13.376
  OK (113 tests)

Change-Id: Ib5784b9ed0b9086f153dd438b2b791ae0bca2621
2018-12-03 17:34:14 -08:00
Raman Tenneti be218f9e9c Revert "AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work." am: a302369720
am: c7f3a297a3

Change-Id: I312e362e00a7836762ca1c260d9b5a0de549d12b
2018-12-03 16:11:33 -08:00
Raman Tenneti c7f3a297a3 Revert "AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work."
am: a302369720

Change-Id: Ifa397fe547adc645c6ffcb0027c0d54f09b8079a
2018-12-03 16:05:32 -08:00
Raman Tenneti a302369720 Revert "AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work."
This reverts commit 9752cda535.

Reason for revert: com.android.devicehealthchecks are failing https://sponge.corp.google.com/target?id=3b9a97f0-48bc-410d-94ce-0971c2f75361&target=com.android.devicehealthchecks&searchFor=&show=FAILED&sortBy=STATUS

Change-Id: I82d337b1d859083169ac6057b408f7e920f06609
2018-12-03 23:26:08 +00:00
Raman Tenneti a6eb91daea AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work. + ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification. + GetOrCreateConversationActionTest - conversation already exists (changed the assert). + ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument. These tests weren't passing witout any changes (they weren't even starting without the target version update). am: 9752cda535
am: ca5b535a2b

Change-Id: Ia2a992cc0844cf9f64fc52e4046256dfb0fc1de8
2018-12-03 13:37:52 -08:00
Raman Tenneti ca5b535a2b AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work. + ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification. + GetOrCreateConversationActionTest - conversation already exists (changed the assert). + ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument. These tests weren't passing witout any changes (they weren't even starting without the target version update).
am: 9752cda535

Change-Id: I61e05a893fe857749d13d918d68b2cf960717233
2018-12-03 12:49:08 -08:00