OSDN Git Service
Zhijun He [Fri, 3 Jan 2014 00:48:29 +0000 (16:48 -0800)]
am
9e4b8e41: Merge "Camera2: fix onClosed callback issue"
* commit '
9e4b8e41fbd4acd43d72e7700debdfd3b6596a48':
Camera2: fix onClosed callback issue
Zhijun He [Fri, 3 Jan 2014 00:48:26 +0000 (16:48 -0800)]
am
b437428b: Merge "Camera2: remove waitUntilIdle from Camera2 API"
* commit '
b437428b3f2190951deeb580094054f6a4f09388':
Camera2: remove waitUntilIdle from Camera2 API
Zhijun He [Fri, 3 Jan 2014 00:46:55 +0000 (00:46 +0000)]
Merge "Camera2: fix onClosed callback issue"
Zhijun He [Fri, 3 Jan 2014 00:46:28 +0000 (00:46 +0000)]
Merge "Camera2: remove waitUntilIdle from Camera2 API"
Brett Chabot [Thu, 2 Jan 2014 23:31:30 +0000 (15:31 -0800)]
am
360604b4: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '
360604b4983946580c2e082ca2109f94ae1e5325':
Don't attempt to launch disabled activities in smoke test.
Brett Chabot [Thu, 2 Jan 2014 23:29:54 +0000 (23:29 +0000)]
Merge "Don't attempt to launch disabled activities in smoke test."
Zhijun He [Thu, 2 Jan 2014 23:12:00 +0000 (15:12 -0800)]
Camera2: fix onClosed callback issue
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.
Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
Chris Craik [Thu, 2 Jan 2014 23:01:43 +0000 (15:01 -0800)]
am
406af029: Fix isRecording override
* commit '
406af0293fde2d7bc12629b3a010019641549f08':
Fix isRecording override
Chris Craik [Thu, 2 Jan 2014 22:56:40 +0000 (14:56 -0800)]
Fix isRecording override
Change-Id: Ie73db838b749c29c6a8480ab67897492b83d337a
Brett Chabot [Thu, 2 Jan 2014 22:41:21 +0000 (14:41 -0800)]
Don't attempt to launch disabled activities in smoke test.
Also remove the superfluous runner from manifest.
Bug:
12245071
Change-Id: I724b87dd49b04eb3291be88f6d7ab035d67c3971
Chris Craik [Thu, 2 Jan 2014 21:06:03 +0000 (13:06 -0800)]
am
e459367a: Merge "Use const access to snapshot from OpenGLRenderer"
* commit '
e459367a3a49cbe94dfe38c50369431614dddc9c':
Use const access to snapshot from OpenGLRenderer
Chris Craik [Thu, 2 Jan 2014 21:04:27 +0000 (21:04 +0000)]
Merge "Use const access to snapshot from OpenGLRenderer"
Chris Craik [Wed, 1 Jan 2014 22:45:21 +0000 (14:45 -0800)]
Use const access to snapshot from OpenGLRenderer
Additionally, move clipping methods to StatefulBaseRenderer
Change-Id: Iff232bf16fc1ad3b7d89493da6d8915db7bc5e4f
Baligh Uddin [Thu, 2 Jan 2014 16:25:36 +0000 (08:25 -0800)]
am
23ab74de: (-s ours) Import translations. DO NOT MERGE
* commit '
23ab74de5eda745e2ef88bd156cde83fbcd4b5da':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 2 Jan 2014 16:21:41 +0000 (08:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id551f263c58a8e036dd44b509242ed3b0ea38f3a
Auto-generated-cl: translation import
Chris Craik [Wed, 1 Jan 2014 22:17:11 +0000 (14:17 -0800)]
am
14e51305: Move Snapshot management to intermediate StatefulBaseRenderer class
* commit '
14e513058ed4168c94e015638d16f5f87fd8063a':
Move Snapshot management to intermediate StatefulBaseRenderer class
Chris Craik [Mon, 30 Dec 2013 23:32:54 +0000 (15:32 -0800)]
Move Snapshot management to intermediate StatefulBaseRenderer class
The eventual goal is for the StatefulBaseRenderer to serve as the
common base class between the DisplayListRenderer and OpenGLRenderer.
This will separate DisplayList recording, Snapshot stack management,
and the GL in OpenGLRenderer.
Additionally, avoid sp<> parameters, and use const parameters in
several places, with the intent of greatly reducing the surface area
where renderer subclasses can modify snapshot stack.
Next steps:
-move bulk of clipping logic into StatefulBaseRenderer
-disable direct snapshot access
Change-Id: Ibc3c6747134ec7daf8ea535866239fa73b874390
Chris Craik [Mon, 30 Dec 2013 21:58:51 +0000 (13:58 -0800)]
am
539394ec: Merge "Create abstract base class for OpenGLRenderer"
* commit '
539394ec3aee7b5868c14e5e692684c8a875a3d4':
Create abstract base class for OpenGLRenderer
Chris Craik [Mon, 30 Dec 2013 21:55:47 +0000 (21:55 +0000)]
Merge "Create abstract base class for OpenGLRenderer"
Eino-Ville Talvala [Mon, 30 Dec 2013 20:56:55 +0000 (12:56 -0800)]
am
aa161c60: Merge "Camera2: Update android.blackLevel.lock"
* commit '
aa161c600dc17cd33c7276e61fb258dca6aa293d':
Camera2: Update android.blackLevel.lock
Eino-Ville Talvala [Mon, 30 Dec 2013 20:55:23 +0000 (20:55 +0000)]
Merge "Camera2: Update android.blackLevel.lock"
Baligh Uddin [Mon, 30 Dec 2013 19:01:49 +0000 (11:01 -0800)]
am
b30b09d7: (-s ours) am
136884b8: (-s ours) am
cc265eaf: (-s ours) am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
b30b09d771001a8ead659d6a5af36ed4adaa6cb8':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:58:13 +0000 (18:58 +0000)]
am
136884b8: (-s ours) am
cc265eaf: (-s ours) am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
136884b8e6202e0c5aa49f48c4f1d41568d7f0b3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:55:43 +0000 (18:55 +0000)]
am
cc265eaf: (-s ours) am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
cc265eafed190a3586419cd43ddb4c62c9e874b5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:52:29 +0000 (18:52 +0000)]
am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
bb23697a7e2ad4568d402e7efe006fc4ac650749':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:49:56 +0000 (10:49 -0800)]
am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
d58d91ef8296a75e07fa7b9b78dd6d9f5dd72015':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:47:12 +0000 (10:47 -0800)]
am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:46:38 +0000 (10:46 -0800)]
am
2aec0d41: (-s ours) Import translations. DO NOT MERGE
* commit '
2aec0d413ea44def9ce779051579e6fb187dd821':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 17:50:54 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If0e9986ff948df22a01cac35ad4fe8ebf40570ef
Auto-generated-cl: translation import
Baligh Uddin [Mon, 30 Dec 2013 17:30:42 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
Chris Craik [Sat, 28 Dec 2013 00:54:32 +0000 (16:54 -0800)]
am
91fcb7d7: Merge "Avoid implicit parameter/return value casting of pointers."
* commit '
91fcb7d7e35eb6eb4bceaa00d186a8a0b09bb142':
Avoid implicit parameter/return value casting of pointers.
Chris Craik [Sat, 28 Dec 2013 00:51:19 +0000 (00:51 +0000)]
Merge "Avoid implicit parameter/return value casting of pointers."
Chris Craik [Sat, 28 Dec 2013 00:51:08 +0000 (16:51 -0800)]
am
7a02ea3e: Avoid implicit parameter casting of pointers.
* commit '
7a02ea3eaafac782b532ef366863a0b2554ae536':
Avoid implicit parameter casting of pointers.
Chris Craik [Fri, 27 Dec 2013 23:15:55 +0000 (15:15 -0800)]
Avoid implicit parameter/return value casting of pointers.
Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
Chris Craik [Sat, 28 Dec 2013 00:43:22 +0000 (16:43 -0800)]
Avoid implicit parameter casting of pointers.
Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
Chris Craik [Thu, 26 Dec 2013 23:13:13 +0000 (15:13 -0800)]
Create abstract base class for OpenGLRenderer
This will eventually serve as a base class to allow
DisplayListRenderer to split off from OpenGLRenderer, and could
eventually support other rendering approaches, such as an
SkCanvas/SkPicture.
This will also be the main source of (implementation-independent)
documentation of the canvas/renderer methods.
Change-Id: I52047f338f5cf86a3b0b3002af7154bff5c3c227
Baligh Uddin [Thu, 26 Dec 2013 23:58:49 +0000 (15:58 -0800)]
am
6debfb90: (-s ours) am
57d5cc88: (-s ours) am
5cf8dc8e: (-s ours) am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6debfb90eea84959ab51a6c3585549dd48e277f3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:58:43 +0000 (15:58 -0800)]
am
00703316: (-s ours) am
bf29cbbc: (-s ours) am
28e21fb4: (-s ours) am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
00703316a8a53acb2c5a99adfcd3f2771f263b89':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:58:40 +0000 (15:58 -0800)]
am
f87f7b01: (-s ours) am
7aa47b52: (-s ours) am
c3e5b034: (-s ours) am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f87f7b0196ecd9dc9a66271d2961961b2f4ef3f8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:58:37 +0000 (15:58 -0800)]
am
f38d305b: (-s ours) am
1bc72efd: (-s ours) am
6afb554c: (-s ours) am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
f38d305bfa0152e8cf6093eb681617f4845a4b76':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:58:34 +0000 (15:58 -0800)]
am
22c082b0: am
ae9702bb: am
ac4ebda9: am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" int
* commit '
22c082b00b94f4bec577aa99ea5bf0e3d1b009f1':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:58:31 +0000 (15:58 -0800)]
am
5b100c15: am
9e39c952: am
9dd65b93: am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
5b100c15d21fa339fabe4a8776a008669a4922f1':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:58:21 +0000 (15:58 -0800)]
am
9bd62d7a: am
aea9c66b: am
4e5a9b72: am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
9bd62d7a6135289aebc96666866eafa0d92cd18f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:58:18 +0000 (15:58 -0800)]
am
79991702: am
6208ef25: am
c609cb0d: am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
7999170276f18a5c5b9941ef65e4dff2ad7d9225':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:58:15 +0000 (15:58 -0800)]
am
cafb29a3: am
7c0da7ec: am
bb6316db: am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
cafb29a3159bd2ee9f77309e91c39ec8e22ab102':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:58:12 +0000 (15:58 -0800)]
am
0c0474fd: am
75b3c99e: am
c2a3227a: am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
0c0474fd87f5cf3f640c477135eb6d4c3237fa12':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:54:55 +0000 (23:54 +0000)]
am
57d5cc88: (-s ours) am
5cf8dc8e: (-s ours) am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
57d5cc8849d47ed22db2c33590a7bf073a63cf07':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:49 +0000 (23:54 +0000)]
am
bf29cbbc: (-s ours) am
28e21fb4: (-s ours) am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bf29cbbc1df534dcf2f8553c70920b7cc056e76c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:44 +0000 (23:54 +0000)]
am
7aa47b52: (-s ours) am
c3e5b034: (-s ours) am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:39 +0000 (23:54 +0000)]
am
1bc72efd: (-s ours) am
6afb554c: (-s ours) am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
1bc72efdef558f05164202df07a025983819d4ea':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:54:33 +0000 (23:54 +0000)]
am
ae9702bb: am
ac4ebda9: am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
ae9702bb41ba9f96ce26ff6e25ed9497632e087f':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:54:27 +0000 (23:54 +0000)]
am
9e39c952: am
9dd65b93: am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
9e39c9526d89f875a0884629d020e2253e9179dd':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:54:20 +0000 (23:54 +0000)]
am
aea9c66b: am
4e5a9b72: am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
aea9c66b4c39b1f5af132b7de800c383aa0df068':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:54:15 +0000 (23:54 +0000)]
am
6208ef25: am
c609cb0d: am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
6208ef25fd9b570770065edbfa71bbb2de8aa511':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:54:10 +0000 (23:54 +0000)]
am
7c0da7ec: am
bb6316db: am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
7c0da7ec5f26179d31b1f3b3211389765baeecc2':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:54:01 +0000 (23:54 +0000)]
am
75b3c99e: am
c2a3227a: am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
75b3c99ef542f91a690f62c46970bc9e3795ad30':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:50:28 +0000 (23:50 +0000)]
am
5cf8dc8e: (-s ours) am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5cf8dc8ea5b364802f9e986ddb7f4e21652145be':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:23 +0000 (23:50 +0000)]
am
28e21fb4: (-s ours) am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:18 +0000 (23:50 +0000)]
am
c3e5b034: (-s ours) am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c3e5b034ca88360f98c1b60e48ab9640dbd271b9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:13 +0000 (23:50 +0000)]
am
6afb554c: (-s ours) am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
6afb554cf07d2a4a2bffed34b696690d8ed0450a':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:50:08 +0000 (23:50 +0000)]
am
ac4ebda9: am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
ac4ebda9f64f7ff54270f9448f597bac4dea71fc':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:50:02 +0000 (23:50 +0000)]
am
9dd65b93: am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
9dd65b9397c97726bdd55ee7e91905f9ee34597c':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:49:57 +0000 (23:49 +0000)]
am
4e5a9b72: am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
4e5a9b72afbd902227d8dcef6426d3a3be41daef':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:49:51 +0000 (23:49 +0000)]
am
c609cb0d: am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
c609cb0d62b25b2526b8401e576df4dce5aa5a92':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:49:45 +0000 (23:49 +0000)]
am
bb6316db: am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
bb6316db12418c3f010f8c730f6d4644920bbe8a':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:49:39 +0000 (23:49 +0000)]
am
c2a3227a: am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
c2a3227a3d4bc055f311b50693b671c9667cfa67':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:44:18 +0000 (23:44 +0000)]
am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ca7a1442d0f633b663e59813957e98ef68c5f99e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:08 +0000 (23:44 +0000)]
am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c60be5b135dd13556e947784f20f792c1f9d568':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:03 +0000 (23:44 +0000)]
am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ad141bd7e267c74daf33416412f9aab30e9751fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:43:59 +0000 (23:43 +0000)]
am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
b6d55917122b314c4ec547263e774934d67f2973':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:43:54 +0000 (23:43 +0000)]
am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
f16ddd6dd4fae500b7b512568db2c55b8919d920':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:43:49 +0000 (23:43 +0000)]
am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
cd73f7702fca082bf46d64b5c011f9dbe1b5fe65':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)]
am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
317109dfaf0682f6ffbf11d71f3da84dfa295df6':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:43:40 +0000 (23:43 +0000)]
am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
b889885e9b5a605329ff8d7a35c373c88abf8c35':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:43:36 +0000 (23:43 +0000)]
am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5938b9a00e0133ca093755568c9a8a2e202f7daf':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:43:31 +0000 (23:43 +0000)]
am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
39b799820db4fa258dadb45b030830656168f95b':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:34:23 +0000 (15:34 -0800)]
am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a95f6e3ac450a8df9ae90585f2c0c02726f9cb01':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:18 +0000 (15:34 -0800)]
am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7aa56efd7399b0628bde655c535fac6407eaade9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:14 +0000 (15:34 -0800)]
am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
dd6517c9dff66a2165e147201e813e1f305425c2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:10 +0000 (15:34 -0800)]
am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
e965be75746d898611ee15d601dc97c8b206a542':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:34:03 +0000 (15:34 -0800)]
am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
2a1912971849b929dc2e4ec8d6368f477b1fddae':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:33:58 +0000 (15:33 -0800)]
am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:33:52 +0000 (15:33 -0800)]
am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:33:47 +0000 (15:33 -0800)]
am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:33:43 +0000 (15:33 -0800)]
am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5ad0e6289119dfaaa50a663e88dc0b978447302c':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:33:37 +0000 (15:33 -0800)]
am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
52604aadaafc0921c2f81df715f01bec546021a2':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Zhijun He [Thu, 26 Dec 2013 22:34:18 +0000 (14:34 -0800)]
am
aeb18a8e: Merge "Camera2: Update availableThumbnailSizes java doc"
* commit '
aeb18a8edabfe71fb947f9a7b2175b477eaab472':
Camera2: Update availableThumbnailSizes java doc
Zhijun He [Thu, 26 Dec 2013 22:31:59 +0000 (22:31 +0000)]
Merge "Camera2: Update availableThumbnailSizes java doc"
Zhijun He [Thu, 26 Dec 2013 22:14:04 +0000 (14:14 -0800)]
Camera2: remove waitUntilIdle from Camera2 API
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
Eino-Ville Talvala [Thu, 26 Dec 2013 21:19:10 +0000 (13:19 -0800)]
Camera2: Update android.blackLevel.lock
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
Baligh Uddin [Thu, 26 Dec 2013 21:01:46 +0000 (13:01 -0800)]
am
a0b866d1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
a0b866d12d89c7b141a2e61c8cb23b686dfb6672':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 21:00:44 +0000 (13:00 -0800)]
am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bbeb313567064b30ad93cdadd49beb8141c3d47b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 20:58:36 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 26 Dec 2013 20:58:31 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Zhijun He [Thu, 26 Dec 2013 19:49:09 +0000 (11:49 -0800)]
Camera2: Update availableThumbnailSizes java doc
Bug:
12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
Baligh Uddin [Thu, 26 Dec 2013 19:15:59 +0000 (11:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I27cfb0c604a4ab3deef7c4a55701e74cb1905172
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:11:15 +0000 (11:11 -0800)]
am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:10:49 +0000 (11:10 -0800)]
am
799cff63: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
799cff63c77fadbba833081775fca0295e3dc6e5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:09:48 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:09:24 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE"
OSDN Git Service
