OSDN Git Service
Jeff Sharkey [Tue, 20 Jun 2017 22:39:16 +0000 (16:39 -0600)]
Only onboard when launched through front door.
When an app is using public API to take a photo, don't confuse the
user with the onboarding flow.
Test: cts-tradefed run commandAndExit cts-dev -m CtsProviderTestCases -t android.provider.cts.MediaStoreUiTest#testImageCapture
Bug:
62204676
Change-Id: Ie0de7b879302a5dd4bf941bf31b449bda95cfdf7
Bill Yi [Wed, 10 May 2017 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafd232fbeec8aaaf835a4467762690c4582cee72
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 2 May 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev
Alan Viverette [Tue, 2 May 2017 15:11:20 +0000 (15:11 +0000)]
Revert "Include v4, use AAPT2"
Unbundled build was mysteriously failing on missing v13 res APK.
This reverts commit
1c43fe84ebb78d2dc72879be405042ff27d2e2df.
Change-Id: I17d95538dcda742baaf4f356ccdea09a7db016a6
TreeHugger Robot [Tue, 2 May 2017 13:11:23 +0000 (13:11 +0000)]
Merge "Include v4, use AAPT2" into oc-dev
Bill Yi [Sat, 29 Apr 2017 08:47:55 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7defff21fd529b338daf0c13219877f6e85a3ee
Auto-generated-cl: translation import
Adam Lesinski [Wed, 26 Apr 2017 23:49:36 +0000 (16:49 -0700)]
Remove illegal @+ use with dimen type
@+id/foo is a way to specify an ID or create one if it doesn't exist.
This is fine to do because an ID is simply a placeholder value that is
assigned a resource ID.
@+dimen/foo doesn't make sense because there is no implicit value to
create if the resource doesn't exist.
Bug:
37716235
Test: builds
Change-Id: Ic897b208fd338bc00ac47de04ea74f0993e6a052
Alan Viverette [Wed, 26 Apr 2017 15:03:32 +0000 (11:03 -0400)]
Include v4, use AAPT2
Test: make checkbuild
Change-Id: I663698dbc698685139250f7fc7150894cfa9b7d0
Bill Yi [Tue, 11 Apr 2017 03:51:10 +0000 (20:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cf9109911cea61f272b388ae29744ff04614fd6
Auto-generated-cl: translation import
Sheng-Hao Tsao [Tue, 21 Mar 2017 12:55:30 +0000 (20:55 +0800)]
Specify android:resizeableActivity as false
The camera app targets API 24 but does not specify
android:resizeableActivity so it is treated as resizeable, which
disable the orientation workaround. We should specify
android:resizeableActivity as false.
BUG=
36469955
TEST=Verify in N that default camera shows correct preview
Change-Id: I97ca868e6c5b29bc156e8d856ee004b06f2b9878
Tomasz Mikolajewski [Tue, 14 Mar 2017 06:50:22 +0000 (15:50 +0900)]
Hide review UI on resume in Camera2.
PhotoModule is used for capturing intents only on legacy hardware,
and it would show broken UI when paused, then resumed during image
review (confirmation UI).
This CL fixes it by hiding the review UI on resume. This is not ideal,
but it's the same behavior as on non-legacy hardware, and the fix
was straightforward.
Test: Confirmed manually that minimizing and restoring on ARC++
during image review discards the taken picture.
Bug:
33701231
Change-Id: Ie7f67145fab21c8c1952832bab6cd26591d2bda0
(cherry picked from commit
47dc2d1ed16baac83c6ef14c06c7564422a5967c)
Paul Duffin [Thu, 9 Mar 2017 14:09:23 +0000 (14:09 +0000)]
Merge "Removed littlemock dependency and cleanup" am:
1ab3beeb31 am:
9a90f916d9
am:
2f6e428731
Change-Id: I30bf0cc0fb761f315ee3c3abf58d0bbac30a0147
Paul Duffin [Thu, 9 Mar 2017 14:05:52 +0000 (14:05 +0000)]
Merge "Removed littlemock dependency and cleanup" am:
1ab3beeb31
am:
9a90f916d9
Change-Id: I78c01db6b8a097d48105ab5693c2807b9d9c8ad9
Paul Duffin [Thu, 9 Mar 2017 14:02:51 +0000 (14:02 +0000)]
Merge "Removed littlemock dependency and cleanup"
am:
1ab3beeb31
Change-Id: Ib32db9eaa28e62b18ca867b09531836742f17785
Paul Duffin [Thu, 9 Mar 2017 14:00:03 +0000 (14:00 +0000)]
Merge "Removed littlemock dependency and cleanup"
Paul Duffin [Mon, 6 Mar 2017 16:18:15 +0000 (16:18 +0000)]
Removed littlemock dependency and cleanup
The tests_camera classes are legacy tests that have not been
built for nearly 4 years. This removes those classes and removes
the littlemock and dexmaker dependencies that are no longer
needed.
Bug:
32912773
Test: build, install and run using am instrument
Change-Id: I623d52fd5471f75622c2175061467ad5519dad13
Bill Yi [Tue, 28 Feb 2017 00:59:02 +0000 (16:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia3607f6609171681fbb0a0b613c5b50954a5303f
Auto-generated-cl: translation import
Bill Yi [Wed, 22 Feb 2017 07:15:01 +0000 (23:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icaff25420ee2010e090efec5c09d7f561e6ec6e4
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 22:17:30 +0000 (14:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cedb4f29041981a2d898ef1c28105890a1ed211
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 16:02:40 +0000 (16:02 +0000)]
Import translations. DO NOT MERGE am:
d7b513a97d -s ours
am:
a4fa1a11c8 -s ours
Change-Id: Id001bcb60d8cb7f9eddd83553154d60718102f7e
Bill Yi [Thu, 16 Feb 2017 15:56:49 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
d7b513a97d -s ours
Change-Id: Ic71205c188195b97f830b3fd4d14753ec8e06b95
Bill Yi [Thu, 16 Feb 2017 00:13:20 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I71a34d56a84da0c454040de838516a50073d3c02
Auto-generated-cl: translation import
Bill Yi [Mon, 6 Feb 2017 15:28:40 +0000 (07:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf4d586f74185c3d3ac2b6ce0201cb31a81d97f8
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 08:48:01 +0000 (08:48 +0000)]
Import translations. DO NOT MERGE am:
d5645db64d -s ours
am:
13a638e9d7 -s ours
Change-Id: I5949954e8e17c89c5717321f8503a9ac0b7a2990
Bill Yi [Fri, 3 Feb 2017 08:35:02 +0000 (08:35 +0000)]
Import translations. DO NOT MERGE
am:
d5645db64d -s ours
Change-Id: I1d4598708f607114310195a99fbede8679a4084f
Bill Yi [Thu, 2 Feb 2017 22:13:48 +0000 (14:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I463ce0acd3456ef53a651e58f580add9e5bc2cec
Auto-generated-cl: translation import
Roozbeh Pournader [Wed, 11 Jan 2017 05:28:44 +0000 (21:28 -0800)]
Rename language+country resources to just language
Bug:
26496609
Test: none
Change-Id: I9afd24b29d7e98712ed2d3c30a0a93ab8615caac
Bill Yi [Tue, 10 Jan 2017 06:01:25 +0000 (22:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I919c5b5fbd37aee16a78de839de6bea19771df9a
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 07:24:44 +0000 (23:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I75b542249d7e8f6b1b80beb4c8f314738def2342
Auto-generated-cl: translation import
Bill Yi [Tue, 6 Dec 2016 03:20:34 +0000 (19:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8e3b115e802252610610b2ca1fae54341e512f19
Auto-generated-cl: translation import
Bill Yi [Mon, 5 Dec 2016 18:30:25 +0000 (18:30 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
811ef659d420c2df2b4e4e463bd4441f4896e34f.
Change-Id: I4da7ced3910effd88283ee4e594d5caa4b1b6724
Bill Yi [Sat, 3 Dec 2016 08:48:47 +0000 (00:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1c20d387475570623df19fd9e508364eb43b202e
Auto-generated-cl: translation import
Bill Yi [Mon, 21 Nov 2016 02:44:12 +0000 (02:44 +0000)]
Import translations. DO NOT MERGE am:
27628b01c6 -s ours am:
2a7d40c7ce -s ours
am:
3efdf1cb8f -s ours
Change-Id: I4b0e8e4845cb388ba1cea99a5095de84faa65fc1
Bill Yi [Mon, 21 Nov 2016 02:30:04 +0000 (02:30 +0000)]
Import translations. DO NOT MERGE am:
27628b01c6 -s ours
am:
2a7d40c7ce -s ours
Change-Id: I0a32502d3f010bb7bf55f4f66dbaa9db0b6e15a7
Bill Yi [Mon, 21 Nov 2016 02:08:02 +0000 (02:08 +0000)]
Import translations. DO NOT MERGE
am:
27628b01c6 -s ours
Change-Id: Id353ddfcb491d33736846f4342d9c43a2ab92adb
Bill Yi [Mon, 21 Nov 2016 01:09:42 +0000 (17:09 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I9ed2a155739a3c7cbee55e40b280d3455778b33a
Bill Yi [Sat, 12 Nov 2016 05:36:50 +0000 (21:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5a3734a69d1bd0a8d413213c25116e8a84369b50
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 06:58:25 +0000 (06:58 +0000)]
Import translations. DO NOT MERGE am:
2432746427 -s ours
am:
27656ec6ab -s ours
Change-Id: Iec3ce4445ff2be36fb4407af3a750261014b345c
Bill Yi [Sat, 5 Nov 2016 06:41:49 +0000 (06:41 +0000)]
Import translations. DO NOT MERGE
am:
2432746427 -s ours
Change-Id: I720cebe22a90dfc359b6e1a7613459788de79ef4
Bill Yi [Fri, 4 Nov 2016 20:43:08 +0000 (13:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I62efcb9f8033f32e24cca1b5b67c720c50ec3e7b
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 02:12:28 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5ef3b7f3351f59970ed7ea4cd9398df48a3668f
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 05:11:09 +0000 (22:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d5a5c08f9ac2a300c4d87e2ab2a16f808e67c46
Auto-generated-cl: translation import
David Benjamin [Wed, 19 Oct 2016 07:40:28 +0000 (07:40 +0000)]
Merge "Fix trivial warning in jpegutil.h." am:
f16c21a499 am:
49d287133d
am:
8aacdf4937
Change-Id: I026568d2f55c0bdbeceb9c4b83f3f1c7dade29ee
David Benjamin [Wed, 19 Oct 2016 07:32:27 +0000 (07:32 +0000)]
Merge "Fix trivial warning in jpegutil.h." am:
f16c21a499
am:
49d287133d
Change-Id: I9d29369da6c7bf0ef0681f0b09c85097b83bfebd
David Benjamin [Wed, 19 Oct 2016 07:25:26 +0000 (07:25 +0000)]
Merge "Fix trivial warning in jpegutil.h."
am:
f16c21a499
Change-Id: I2d730fbb2f21b8964b05e5ef79e2367cc95319be
Treehugger Robot [Wed, 19 Oct 2016 07:14:48 +0000 (07:14 +0000)]
Merge "Fix trivial warning in jpegutil.h."
Sheng-Hao Tsao [Wed, 12 Oct 2016 09:36:44 +0000 (18:36 +0900)]
Fix a bug that captured image in review is rotated
If the default camera app is triggered by intent and the app
orientation is different from the screen orientation, the
captured image in review will be rotated.
This is because calling setScale() clears the whole matrix and make the
previous preRotate() call meaningless. Changing to postScale() solves
the problem.
BUG=
31939529
TEST=Verify that the captured image in review is not rotated
Change-Id: I6d93bac094ba9b6381e350d4007e3c65c1425e31
(cherry picked from commit
3399d3acca6a65a28784185e8164e0bb40d4ef45)
David Benjamin [Tue, 18 Oct 2016 23:52:40 +0000 (19:52 -0400)]
Fix trivial warning in jpegutil.h.
This flew by in the build output. There's a bunch of other warnings, but
this one's easy. Forward declarations should match the actual definition
in struct-vs-class-ness.
Change-Id: I189cabf7846fc90f0597f16509800340dd7956e5
Test: mma
Bill Yi [Thu, 22 Sep 2016 08:04:15 +0000 (01:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbf8fb6ee2778ae2e0423dfe5303a5d7b2579262
Auto-generated-cl: translation import
Bill Yi [Sat, 17 Sep 2016 03:23:35 +0000 (03:23 +0000)]
Import translations. DO NOT MERGE am:
0c2aec1373 -s ours am:
e7373d970a -s ours am:
3dc5eba5fe -s ours
am:
2c235f758a -s ours
Change-Id: Ie9325a9cc8496576744a91c8d5434992fc39b4c8
Bill Yi [Sat, 17 Sep 2016 03:21:07 +0000 (03:21 +0000)]
Import translations. DO NOT MERGE am:
0c2aec1373 -s ours am:
e7373d970a -s ours
am:
3dc5eba5fe -s ours
Change-Id: I50826e33d492162c39b03bb38e5dddfe73803cf0
Bill Yi [Sat, 17 Sep 2016 03:18:07 +0000 (03:18 +0000)]
Import translations. DO NOT MERGE am:
0c2aec1373 -s ours
am:
e7373d970a -s ours
Change-Id: Iaad2508555ee1f66d57922ba447d1744b8895c03
Bill Yi [Sat, 17 Sep 2016 03:15:35 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE
am:
0c2aec1373 -s ours
Change-Id: I65b91df4abfe0dd8de3f27c19a2997f147eeb771
Bill Yi [Sat, 17 Sep 2016 01:13:04 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31516661
Change-Id: I59f0be73c843e75ebcc3a699a31b968deffcdb74
Bill Yi [Mon, 12 Sep 2016 20:59:01 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f2a0dda9c09750809dc0f08dc9fc5520cdb347c
Auto-generated-cl: translation import
Bill Yi [Thu, 1 Sep 2016 03:52:52 +0000 (20:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c972fa973a5b29ab606b945435323ec40b8da23
Auto-generated-cl: translation import
Eino-Ville Talvala [Thu, 25 Aug 2016 01:03:01 +0000 (01:03 +0000)]
Remove calls to silence ringer; these require new permissions in N am:
aaae0ae1bb am:
917ac82ac0
am:
0f845e9d12
Change-Id: I5d5ad0fbc6ea03611bbb1f18bc10f5f11a023561
Eino-Ville Talvala [Thu, 25 Aug 2016 00:47:48 +0000 (00:47 +0000)]
Remove calls to silence ringer; these require new permissions in N am:
aaae0ae1bb
am:
917ac82ac0
Change-Id: I2e83ab26c3891316df45269b7825eec3e171ab44
Eino-Ville Talvala [Thu, 25 Aug 2016 00:44:48 +0000 (00:44 +0000)]
Remove calls to silence ringer; these require new permissions in N
am:
aaae0ae1bb
Change-Id: I4ab0ffdb9aedd555a8cfcf6a2401d7dd0d4fde6b
Eino-Ville Talvala [Wed, 24 Aug 2016 22:35:00 +0000 (15:35 -0700)]
Remove calls to silence ringer; these require new permissions in N
In N, only applications with permission to manage do-not-disturb
or notification settings are allowed to silence the ringer.
Requesting that permission is not straightforward, and may not be
the right solution, so for now, disable the ringer muting for video
recording.
Bug:
29591150
Change-Id: I630812c0e4ca813bf4fa123321d60a4be6c2fbf7
Bill Yi [Tue, 16 Aug 2016 01:29:42 +0000 (18:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03a0b6fc73c17a602262fd45ddffe6e599b376e0
Auto-generated-cl: translation import
Dan Albert [Sat, 6 Aug 2016 00:12:09 +0000 (00:12 +0000)]
Merge "Bump SDK version to 17 to match dependencies." am:
d1b7453eea am:
b548607eb7 am:
ebebeca22a
am:
f7d296ec1d
Change-Id: If51a409d4780bea95bae80ef4ffda31fb468cd84
Dan Albert [Sat, 6 Aug 2016 00:08:30 +0000 (00:08 +0000)]
Merge "Bump SDK version to 17 to match dependencies." am:
d1b7453eea am:
b548607eb7
am:
ebebeca22a
Change-Id: I2d9e1abfaf4f54a0d0e7f3a1df04bca8f1f46cf1
Dan Albert [Sat, 6 Aug 2016 00:05:28 +0000 (00:05 +0000)]
Merge "Bump SDK version to 17 to match dependencies." am:
d1b7453eea
am:
b548607eb7
Change-Id: Ic48be385dc43c8f3fafbdfdbdd5e3a91678c2604
Dan Albert [Sat, 6 Aug 2016 00:03:05 +0000 (00:03 +0000)]
Merge "Bump SDK version to 17 to match dependencies."
am:
d1b7453eea
Change-Id: Ib38a3804c235bf94d68d57a64c040d256a064d5c
Treehugger Robot [Fri, 5 Aug 2016 23:47:12 +0000 (23:47 +0000)]
Merge "Bump SDK version to 17 to match dependencies."
Dan Albert [Fri, 5 Aug 2016 22:52:34 +0000 (15:52 -0700)]
Bump SDK version to 17 to match dependencies.
external/jpeg uses 17, so we need to be at least that.
Test: mm
Change-Id: I2d479c08579b3ef4d0adde537255b3df05ea5c76
Bill Yi [Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9353cf10ba -s ours am:
c45aaf531c -s ours
am:
2482315b37 -s ours
Change-Id: Ib4f15738eaa69ae53e633fcba8ba9229c28871fd
Bill Yi [Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)]
Import translations. DO NOT MERGE am:
a7531cfaff -s ours am:
9dfb1b6797 -s ours
am:
4000390df2 -s ours
Change-Id: I52173f805cda457ef1a283f9f9b9046b7419dfe1
Bill Yi [Fri, 5 Aug 2016 18:06:59 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9353cf10ba -s ours
am:
c45aaf531c -s ours
Change-Id: I1b8c9850be3bca353df1f8d51c7ae0d26404b6e4
Bill Yi [Fri, 5 Aug 2016 18:06:58 +0000 (18:06 +0000)]
Import translations. DO NOT MERGE am:
a7531cfaff -s ours
am:
9dfb1b6797 -s ours
Change-Id: I390dd301a5437f096fb53231b700686645683e2c
Bill Yi [Fri, 5 Aug 2016 18:04:09 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7905adb795 -s ours am:
8fd0698ddc -s ours am:
75dd2c4a8a -s ours
am:
cf2a88659a -s ours
Change-Id: Ife217d29abf048044cd81c36a7a1df21e46e24bd
Bill Yi [Fri, 5 Aug 2016 18:04:09 +0000 (18:04 +0000)]
Import translations. DO NOT MERGE am:
5a18f27ce1 -s ours am:
9ea376b3a5 -s ours am:
bfd6765951 -s ours
am:
6d2e800c85 -s ours
Change-Id: I0aa0eeb4b95ff4cc5eebf43ce0166cc118545712
Bill Yi [Fri, 5 Aug 2016 18:03:58 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
9353cf10ba -s ours
Change-Id: I536fcb3b49875f04f45beadf0b252c96ee1ed04c
Bill Yi [Fri, 5 Aug 2016 18:03:57 +0000 (18:03 +0000)]
Import translations. DO NOT MERGE
am:
a7531cfaff -s ours
Change-Id: I6be4fca8f9a6c98ccd5ace0767f8d23604c70d96
Bill Yi [Fri, 5 Aug 2016 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7905adb795 -s ours am:
8fd0698ddc -s ours
am:
75dd2c4a8a -s ours
Change-Id: Idf654556814f532c862c79d5fa641b795a3898bb
Bill Yi [Fri, 5 Aug 2016 18:01:40 +0000 (18:01 +0000)]
Import translations. DO NOT MERGE am:
5a18f27ce1 -s ours am:
9ea376b3a5 -s ours
am:
bfd6765951 -s ours
Change-Id: Id0b949d3968112923a378ecca65bad6924085278
Bill Yi [Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7905adb795 -s ours am:
31f38f5558 -s ours
am:
486a331392 -s ours
Change-Id: I1c2a9ebe6530b9d7da09f6f4e4fd406c67f38aca
Bill Yi [Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)]
Import translations. DO NOT MERGE am:
5a18f27ce1 -s ours am:
f4de98479f -s ours
am:
d99b86ad49 -s ours
Change-Id: If7cb720f1391c76f1bebd4e28ea6370eacf4a431
Bill Yi [Fri, 5 Aug 2016 18:00:49 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours am:
e71889a282 -s ours am:
9d439f5e85 -s ours am:
4ab6164e95 -s ours
am:
3c661804bb -s ours
Change-Id: Ic231fa4999912b430ebcb1720169c2f615540807
Bill Yi [Fri, 5 Aug 2016 18:00:49 +0000 (18:00 +0000)]
Import translations. DO NOT MERGE am:
5f23bb8094 -s ours am:
e7035ebabd -s ours am:
4fcefcdf08 -s ours am:
01b7b68812 -s ours
am:
f597265c23 -s ours
Change-Id: I9c37633c926be381fc5393bc44f46e4456727b69
TreeHugger Robot [Fri, 5 Aug 2016 18:00:32 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 5 Aug 2016 17:58:33 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7905adb795 -s ours
am:
31f38f5558 -s ours
Change-Id: I8487d8c96a0df4b5cae01c19f214340bda47df6d
Bill Yi [Fri, 5 Aug 2016 17:58:33 +0000 (17:58 +0000)]
Import translations. DO NOT MERGE am:
5a18f27ce1 -s ours
am:
f4de98479f -s ours
Change-Id: Ic39d0ad6050b57d84add5e394810d60a2bc20bc3
Bill Yi [Fri, 5 Aug 2016 17:58:32 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7905adb795 -s ours
am:
8fd0698ddc -s ours
Change-Id: Iba9ad4412ceb218efd5d21a591f420b3f4812878
Bill Yi [Fri, 5 Aug 2016 17:58:32 +0000 (17:58 +0000)]
Import translations. DO NOT MERGE am:
5a18f27ce1 -s ours
am:
9ea376b3a5 -s ours
Change-Id: I88a6c6dcda348c4c6184f320738c36a0008e0ee0
Bill Yi [Fri, 5 Aug 2016 17:56:02 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7905adb795 -s ours
Change-Id: I87cc70d3b04f893457f609c0d3a06929d2b1d035
Bill Yi [Fri, 5 Aug 2016 17:56:02 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7905adb795 -s ours
Change-Id: Ia169ee5b8b79c91b0d1c08e4ff180c4e79bcf250
Bill Yi [Fri, 5 Aug 2016 17:56:01 +0000 (17:56 +0000)]
Import translations. DO NOT MERGE
am:
5a18f27ce1 -s ours
Change-Id: I2ad329c7548e21c9ea0f54c09d687c41d109dd6a
Bill Yi [Fri, 5 Aug 2016 17:56:01 +0000 (17:56 +0000)]
Import translations. DO NOT MERGE
am:
5a18f27ce1 -s ours
Change-Id: I7afeef5b6fd050b72ef677c9bd1cae5bc8949be0
Bill Yi [Fri, 5 Aug 2016 17:53:44 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours am:
e71889a282 -s ours am:
9d439f5e85 -s ours
am:
4ab6164e95 -s ours
Change-Id: Ic09caad10ea12e3fc67b5ca0a3cd4cf98923046f
Bill Yi [Fri, 5 Aug 2016 17:53:43 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE am:
5f23bb8094 -s ours am:
e7035ebabd -s ours am:
4fcefcdf08 -s ours
am:
01b7b68812 -s ours
Change-Id: I9907b7d9f89d8d7cc906b75ff44a06786a1e2680
TreeHugger Robot [Fri, 5 Aug 2016 17:52:30 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 5 Aug 2016 17:48:56 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours am:
e71889a282 -s ours
am:
9d439f5e85 -s ours
Change-Id: I0d67a56486c9dd252d83d741e288aa09e6a80f21
Bill Yi [Fri, 5 Aug 2016 17:48:55 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE am:
5f23bb8094 -s ours am:
e7035ebabd -s ours
am:
4fcefcdf08 -s ours
Change-Id: I71e7a1244441508c8850b46988b10a0e0c6fd5a8
Bill Yi [Fri, 5 Aug 2016 17:48:09 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours am:
e71889a282 -s ours am:
94856ce4bf -s ours
am:
3a9fa60fc9 -s ours
Change-Id: I1f08503a6845a10334873d79908b643cf890f3e6
Bill Yi [Fri, 5 Aug 2016 17:48:08 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE am:
5f23bb8094 -s ours am:
e7035ebabd -s ours am:
002973d5cf -s ours
am:
240a93171f -s ours
Change-Id: I0a958296a4499ad68a238498f85f7774b8c38710
Bill Yi [Fri, 5 Aug 2016 17:45:09 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours am:
e71889a282 -s ours
am:
94856ce4bf -s ours
Change-Id: I4594ef792b882cdeb0ee4a323856aa7a11e1477d
Bill Yi [Fri, 5 Aug 2016 17:45:08 +0000 (17:45 +0000)]
Import translations. DO NOT MERGE am:
5f23bb8094 -s ours am:
e7035ebabd -s ours
am:
002973d5cf -s ours
Change-Id: I6aee27ee969145cab91e2124c17dbf90dc0483f3
Bill Yi [Fri, 5 Aug 2016 17:42:30 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
54d4aa374f -s ours
am:
e71889a282 -s ours
Change-Id: I0bb3c33c4c61dd608a60ff68bbc05f1dc8a3ec84
OSDN Git Service
