64114 Commits

Author SHA1 Message Date
Quddus Chong
5f9d36d5b9 am 02c6cad7: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '02c6cad7c49942336ed6a8fe015c0cb4eced0c82':
2012-04-12 13:01:29 -07:00
Quddus Chong
2a1a1fa626 am 6073985e: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '6073985e8a6d3f32f86a24e7a2a6bbf5b6a90b4e':
  docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
2012-04-12 13:00:18 -07:00
Quddus Chong
02c6cad7c4 am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '6971153d88ebe2e441b75081a273b88424498a45':
  docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
2012-04-12 12:58:27 -07:00
Quddus Chong
6073985e8a am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '6971153d88ebe2e441b75081a273b88424498a45':
  docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
2012-04-12 12:58:20 -07:00
Quddus Chong
6971153d88 Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1 2012-04-12 12:56:29 -07:00
Quddus Chong
ee71b1fa2d docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event).
Bug: 6318537

Change-Id: I4fb0f103bfe3ddf485e1bfa76eb39a51adce1aaa
2012-04-12 12:34:53 -07:00
Robert Ly
03c8a18990 am 920e2eef: am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1
* commit '920e2eeff321a7b029af9c1aee35b9070b2d18e8':
2012-04-12 12:34:43 -07:00
Robert Ly
75364054ac am 9a00e8f1: am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1
* commit '9a00e8f138b13b551a96104675c93035ea1eface':
  docs: fix bug 5158332
2012-04-12 12:32:18 -07:00
Robert Ly
9a00e8f138 am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1
* commit '070827e6031a312d368f33fb1ad8babff92e64e4':
  docs: fix bug 5158332
2012-04-12 12:29:33 -07:00
Robert Ly
920e2eeff3 am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1
* commit '070827e6031a312d368f33fb1ad8babff92e64e4':
  docs: fix bug 5158332
2012-04-12 12:29:29 -07:00
Robert Ly
070827e603 Merge "docs: fix bug 5158332" into ics-mr1 2012-04-12 12:27:20 -07:00
Jeff Sharkey
2cec767b8a am 3d33c68f: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit '3d33c68f9e0ddc3b022e027e7644e908cfc9725e':
2012-04-11 21:15:01 -07:00
Jeff Sharkey
f6e4295316 am 88d97104: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit '88d9710483c07c6fe985018e276532a2c480df81':
  DO NOT MERGE: Make component names visible in javadoc.
2012-04-11 19:24:25 -07:00
Jeff Sharkey
88d9710483 am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit 'd9818244f9bf47b9e2981df7866b1ace01392fa9':
  DO NOT MERGE: Make component names visible in javadoc.
2012-04-11 19:21:27 -07:00
Jeff Sharkey
3d33c68f9e am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit 'd9818244f9bf47b9e2981df7866b1ace01392fa9':
  DO NOT MERGE: Make component names visible in javadoc.
2012-04-11 19:21:12 -07:00
Jeff Sharkey
d9818244f9 Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1 2012-04-11 19:18:45 -07:00
Jeff Sharkey
aa0a453a7a DO NOT MERGE: Make component names visible in javadoc.
Change-Id: I3770ea6616b8425c387bcd27d668e3114b14335d
2012-04-11 19:15:42 -07:00
Quddus Chong
e960c30d22 am a2ac13ee: am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit 'a2ac13ee0141035bfe5cd882d095a10883576392':
2012-04-11 16:14:22 -07:00
Quddus Chong
c418059485 am 51cb7ca5: am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit '51cb7ca563dda1ea92b76f216e5d2960dcd62cf8':
  SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971
2012-04-11 16:12:23 -07:00
Quddus Chong
a2ac13ee01 am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit 'c08787fc96473b5738a4c024a13a8c7d24af496b':
  SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971
2012-04-11 16:10:23 -07:00
Quddus Chong
51cb7ca563 am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit 'c08787fc96473b5738a4c024a13a8c7d24af496b':
  SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971
2012-04-11 16:09:07 -07:00
Quddus Chong
c08787fc96 Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1 2012-04-11 16:07:01 -07:00
Quddus Chong
3790001c20 SDK doc change: Fixed typo and added method parentheses in line 206.
Bug: 6318971

Change-Id: I57f3c7aff6209269ca0d95d616e551e2100eeb54
2012-04-11 15:47:57 -07:00
Scott Main
4e53730b12 am f1e17d8d: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit 'f1e17d8d47cf7746452e6e4b632209773bdd366c':
2012-04-11 12:47:40 -07:00
Scott Main
047b8f3ccc am 06874425: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '068744258bce3fa5f47aa40f591793bbfa006613':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:38:21 -07:00
Scott Main
f1e17d8d47 am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:35:52 -07:00
Scott Main
068744258b am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:34:29 -07:00
Scott Main
71e8f4c152 Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1 2012-04-11 11:32:40 -07:00
Robert Ly
21c9ae0458 docs: fix bug 5158332
Change-Id: I4ced8e7808727a6789732d10601fe6aa4985d8ba
2012-04-10 16:05:23 -07:00
Android Git Automerger
d1ba689559 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-10 15:01:06 -07:00
Robert Ly
bc8eaa7d63 am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit '11d33b3da5fa8c46be17135deecdded9f11b61a0':
  docs: fixing broken link for bug 6104366
2012-04-10 14:30:34 -07:00
Robert Ly
030c86145a am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
  docs: fixing ndk bug 5991108
2012-04-10 14:30:32 -07:00
Robert Ly
21b2ec7980 am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit '9fd8aaca4762f0852c016af34db696eebd4bfc92':
  docs: fixing renderscript doc bug 6111834
2012-04-10 14:30:30 -07:00
Robert Ly
d87121f46e am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit 'c71a1bb9d455b547cba73947d13a50933c1cb1be':
  docs: fixing broken link for bug 6104366
2012-04-10 14:30:15 -07:00
Robert Ly
07ced01f04 am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
  docs: fixing ndk bug 5991108
2012-04-10 14:30:13 -07:00
Robert Ly
12d80df0b2 am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit '86b6e26c78bf5d491a2cf2aa06e3812be326d722':
  docs: fixing renderscript doc bug 6111834
2012-04-10 14:30:11 -07:00
Robert Ly
c71a1bb9d4 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
2012-04-10 14:26:28 -07:00
Robert Ly
9585dcc48a am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
2012-04-10 14:26:26 -07:00
Robert Ly
86b6e26c78 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
2012-04-10 14:26:19 -07:00
Robert Ly
11d33b3da5 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
2012-04-10 14:26:10 -07:00
Robert Ly
b3f7fc2f77 am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
2012-04-10 14:26:08 -07:00
Robert Ly
9fd8aaca47 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
2012-04-10 14:26:07 -07:00
Robert Ly
23f08c6d64 Merge "docs: fixing broken link for bug 6104366" into ics-mr1 2012-04-10 14:24:00 -07:00
Robert Ly
2e9dac4b05 Merge "docs: fixing ndk bug 5991108" into ics-mr1 2012-04-10 14:23:50 -07:00
Robert Ly
876b7b876e Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 2012-04-10 14:23:37 -07:00
Robert Ly
621ff7d1a5 docs: fixing ndk bug 5991108
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
2012-04-10 13:30:45 -07:00
Robert Ly
41a8c7e68a docs: fixing broken link for bug 6104366
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
2012-04-10 13:20:44 -07:00
Robert Ly
af16675097 docs: fixing renderscript doc bug 6111834
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
2012-04-10 11:56:33 -07:00
Teng-Hui Zhu
6e32ebdff1 am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
  Update SurfaceTexture interface for forward compatibility
2012-04-10 08:42:23 -07:00
Teng-Hui Zhu
bbc46ae749 am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
  Update SurfaceTexture interface for forward compatibility
2012-04-10 08:38:39 -07:00