drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,792 Commits 1 Branch 0 Tags
Commit Graph

121792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
0c0474fd87 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."
 2013-12-26 23:54:01 +00:00
Baligh Uddin
57d5cc8849 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
 2013-12-26 23:50:28 +00:00
Baligh Uddin
bf29cbbc1d 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
 2013-12-26 23:50:23 +00:00
Baligh Uddin
7aa47b5270 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
 2013-12-26 23:50:18 +00:00
Baligh Uddin
1bc72efdef 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
 2013-12-26 23:50:13 +00:00
quddusc
ae9702bb41 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
 2013-12-26 23:50:08 +00:00
quddusc
9e39c9526d 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
 2013-12-26 23:50:02 +00:00
quddusc
aea9c66b4c 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
 2013-12-26 23:49:57 +00:00
quddusc
6208ef25fd 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
 2013-12-26 23:49:51 +00:00
quddusc
7c0da7ec5f 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
 2013-12-26 23:49:45 +00:00
quddusc
75b3c99ef5 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."
 2013-12-26 23:49:39 +00:00
Baligh Uddin
5cf8dc8ea5 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
 2013-12-26 23:44:18 +00:00
Baligh Uddin
28e21fb425 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
 2013-12-26 23:44:08 +00:00
Baligh Uddin
c3e5b034ca 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
 2013-12-26 23:44:03 +00:00
Baligh Uddin
6afb554cf0 am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'b6d55917122b314c4ec547263e774934d67f2973':
  Import translations. DO NOT MERGE
 2013-12-26 23:43:59 +00:00
quddusc
ac4ebda9f6 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
 2013-12-26 23:43:54 +00:00
quddusc
9dd65b9397 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
 2013-12-26 23:43:49 +00:00
quddusc
4e5a9b72af 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
 2013-12-26 23:43:45 +00:00
quddusc
c609cb0d62 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
 2013-12-26 23:43:40 +00:00
quddusc
bb6316db12 am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '5938b9a00e0133ca093755568c9a8a2e202f7daf':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 23:43:36 +00:00
quddusc
c2a3227a3d 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."
 2013-12-26 23:43:31 +00:00
Baligh Uddin
ca7a1442d0 am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a95f6e3ac450a8df9ae90585f2c0c02726f9cb01':
  Import translations. DO NOT MERGE
 2013-12-26 15:34:23 -08:00
Baligh Uddin
4c60be5b13 am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7aa56efd7399b0628bde655c535fac6407eaade9':
  Import translations. DO NOT MERGE
 2013-12-26 15:34:18 -08:00
Baligh Uddin
ad141bd7e2 am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dd6517c9dff66a2165e147201e813e1f305425c2':
  Import translations. DO NOT MERGE
 2013-12-26 15:34:14 -08:00
Baligh Uddin
b6d5591712 am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'e965be75746d898611ee15d601dc97c8b206a542':
  Import translations. DO NOT MERGE
 2013-12-26 15:34:10 -08:00
quddusc
f16ddd6dd4 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
 2013-12-26 15:34:03 -08:00
quddusc
cd73f7702f 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
 2013-12-26 15:33:58 -08:00
quddusc
317109dfaf 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
 2013-12-26 15:33:52 -08:00
quddusc
b889885e9b 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
 2013-12-26 15:33:47 -08:00
quddusc
5938b9a00e am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '5ad0e6289119dfaaa50a663e88dc0b978447302c':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 15:33:43 -08:00
quddusc
39b799820d 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."
 2013-12-26 15:33:37 -08:00
Zhijun He
aeb18a8eda Merge "Camera2: Update availableThumbnailSizes java doc" 2013-12-26 22:32:00 +00:00
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API 
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
 2013-12-26 14:14:04 -08:00
Eino-Ville Talvala
0956af56a2 Camera2: Update android.blackLevel.lock 
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
 2013-12-26 13:19:10 -08:00
Baligh Uddin
a95f6e3ac4 am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bbeb313567064b30ad93cdadd49beb8141c3d47b':
  Import translations. DO NOT MERGE
 2013-12-26 13:00:44 -08:00
Baligh Uddin
a0b866d12d Merge "Import translations. DO NOT MERGE" 2013-12-26 20:58:36 +00:00
Baligh Uddin
bbeb313567 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 20:58:31 +00:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc 
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
 2013-12-26 11:49:09 -08:00
Baligh Uddin
bbd861c23a Import translations. DO NOT MERGE 
Change-Id: I27cfb0c604a4ab3deef7c4a55701e74cb1905172
Auto-generated-cl: translation import
 2013-12-26 11:15:59 -08:00
Baligh Uddin
7aa56efd73 am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
  Import translations. DO NOT MERGE
 2013-12-26 11:11:15 -08:00
Baligh Uddin
5a736a99f8 Import translations. DO NOT MERGE 
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
 2013-12-26 11:09:48 -08:00
Baligh Uddin
799cff63c7 Merge "Import translations. DO NOT MERGE" 2013-12-26 19:09:24 +00:00
Baligh Uddin
7bb3e3b9ee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 19:09:19 +00:00
Baligh Uddin
869de0d1d0 Import translations. DO NOT MERGE 
Change-Id: I90b992fe5850b901f15b4c9ae778a316d574edb2
Auto-generated-cl: translation import
 2013-12-26 11:08:12 -08:00
Baligh Uddin
64ec792948 Import translations. DO NOT MERGE 
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import
 2013-12-26 11:07:34 -08:00
Baligh Uddin
dd6517c9df am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
  Import translations. DO NOT MERGE
 2013-12-26 10:43:19 -08:00
Baligh Uddin
9cfe3a13b1 Merge "Import translations. DO NOT MERGE" 2013-12-26 18:42:01 +00:00
Baligh Uddin
ea227306d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 18:41:56 +00:00
Baligh Uddin
773cb5e728 Import translations. DO NOT MERGE 
Change-Id: I2ca69fa39fbc71249e47fc90b569a7de69b8a7c3
Auto-generated-cl: translation import
 2013-12-26 10:37:08 -08:00
Baligh Uddin
8677794bfa Import translations. DO NOT MERGE 
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
 2013-12-26 10:16:09 -08:00