Elliott Hughes
70347e8352
am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation."
...
* commit '8d4d4cf283d12821caba321204759f2ce3fd210a':
Remove obsolete traceview file format documentation.
2013-02-25 15:30:58 -08:00
Elliott Hughes
8d4d4cf283
Merge "Remove obsolete traceview file format documentation."
2013-02-25 22:50:51 +00:00
Joe Malin
0c7d1abaae
am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit 'b8df147c59381cc66b5acd3718aa3fc1eaa851b6':
Bug 8261430: Typo in Notifications
2013-02-25 11:37:15 -08:00
Joe Malin
b8df147c59
am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '5c8bba358634b20b47a87dcdb65d01988258cc53':
Bug 8261430: Typo in Notifications
2013-02-25 11:36:02 -08:00
Joe Malin
5c8bba3586
am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit 'cfb153b146b7d1627bdc02e2dc24becb2da5b12b':
Bug 8261430: Typo in Notifications
2013-02-25 11:34:46 -08:00
Joe Malin
cfb153b146
am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
Bug 8261430: Typo in Notifications
2013-02-25 11:32:22 -08:00
Joe Malin
06764394eb
Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
2013-02-25 19:29:06 +00:00
Scott Main
c4bed52910
am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit '93b4fcf44bc9ff3ea3359382fb4ba4e2da6a73c8':
docs: add google io registration announcement to home page
2013-02-25 10:44:16 -08:00
Scott Main
93b4fcf44b
am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'f714e0781e30a5cb68326ff2381af3999e0a3e0d':
docs: add google io registration announcement to home page
2013-02-25 10:42:41 -08:00
Scott Main
f714e0781e
am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'b38066bb22e0e71c6e03697d2b3fc18050ff4c76':
docs: add google io registration announcement to home page
2013-02-25 10:41:41 -08:00
Scott Main
b38066bb22
am d51eebae: docs: add google io registration announcement to home page
...
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
docs: add google io registration announcement to home page
2013-02-25 10:40:34 -08:00
Scott Main
d51eebae6d
docs: add google io registration announcement to home page
...
Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42
2013-02-25 10:36:03 -08:00
Joe Fernandez
1f954f2fee
am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit 'd5f87129757814e7fa83739afb921fe42d9e7454':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 10:22:43 -08:00
Joe Malin
43f81181bc
Bug 8261430: Typo in Notifications
...
Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810
2013-02-25 10:20:29 -08:00
Joe Fernandez
d5f8712975
am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit '2ca291b82106b998d544c47454dc595a2430864d':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 10:19:59 -08:00
Joe Fernandez
2ca291b821
am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit '9faf06644da1dc893d74f15ddd69a2e4201b6e07':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 10:14:57 -08:00
Joe Fernandez
9faf06644d
Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
2013-02-25 18:10:54 +00:00
Ian Rogers
92f3e9a1fb
am e88c0d9e: Merge "Recognize odex files in memory accounting."
...
* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
Recognize odex files in memory accounting.
2013-02-25 10:04:53 -08:00
Ian Rogers
e88c0d9ec3
Merge "Recognize odex files in memory accounting."
2013-02-25 17:13:24 +00:00
Elliott Hughes
dbc3c407ae
Remove obsolete traceview file format documentation.
...
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
2013-02-22 21:21:03 -08:00
Ian Rogers
9f8589c31f
Recognize odex files in memory accounting.
...
Give odex files the same heap category as dex files.
Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
2013-02-22 20:35:56 -08:00
Adam Powell
06689433bc
am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
...
* commit 'd61ff77ee10b2c956df153e08b850e852ff5df57':
Fix ListView is not scrolled properly with arrows
2013-02-22 14:06:11 -08:00
Dirk Dougherty
ce7533d24f
am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27':
fix javadocs
2013-02-22 13:48:02 -08:00
Dirk Dougherty
a4ebda27c9
am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit '380d571a65ec6866768c74e3ff360a6620b0d212':
fix javadocs
2013-02-22 13:44:11 -08:00
Dirk Dougherty
380d571a65
am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'dc591c0bf6394f725e5dcf773193adba14e5ccaf':
fix javadocs
2013-02-22 13:41:56 -08:00
Dirk Dougherty
dc591c0bf6
am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f':
fix javadocs
2013-02-22 13:38:34 -08:00
Dirk Dougherty
f15b0908a7
Merge "fix javadocs" into jb-mr1-dev
2013-02-22 21:35:11 +00:00
Robert Ly
894174b4b0
fix javadocs
...
Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687
2013-02-22 13:32:43 -08:00
Adam Powell
d61ff77ee1
Merge "Fix ListView is not scrolled properly with arrows"
2013-02-22 21:29:44 +00:00
Adam Koch
42e1592523
am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'c22261578ae11dc12393346565a374b64678d0d0':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:09:15 -08:00
Adam Koch
c22261578a
am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit '16fcd4ba4ab72c3ae45bf8b9cc084dfb193465c3':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:06:29 -08:00
Adam Koch
16fcd4ba4a
am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'e74f2a32a416a42feb13a5cba31a1f7567d77a0a':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:03:42 -08:00
Adam Koch
e74f2a32a4
am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'b367fd6a87116933b76e5e9bc162dcfe88306aa6':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:01:39 -08:00
Adam Koch
b367fd6a87
Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
2013-02-22 19:58:34 +00:00
Ian Rogers
631bc614f5
am 08a92a33: Merge "Account malloc mmaped pages as native heap."
...
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
Account malloc mmaped pages as native heap.
2013-02-22 10:53:59 -08:00
Dirk Dougherty
531a599660
am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
Doc change: Update DC image, fix typo.
2013-02-22 10:15:52 -08:00
Dirk Dougherty
82f810f3d4
am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit 'bc1a863f687a2bbe9ae71ed22a3ebfaf7f8bbd26':
Doc change: Update DC image, fix typo.
2013-02-22 10:12:14 -08:00
Dirk Dougherty
bc1a863f68
am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '094023a7f155270a0f4ee54b8dd8282d4ffbea23':
Doc change: Update DC image, fix typo.
2013-02-22 10:08:19 -08:00
Dirk Dougherty
094023a7f1
am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '47dae0771cb0db98ff829e19bf505f8628745878':
Doc change: Update DC image, fix typo.
2013-02-22 10:06:09 -08:00
Adam Koch
9bceb5603e
Displaying Bitmaps Efficiently Training - Update sample app zip
...
Change-Id: I97faf4bcf5c46083fdbe2bb094be9a3bcfff0bd8
2013-02-22 13:03:06 -05:00
Ian Rogers
08a92a335f
Merge "Account malloc mmaped pages as native heap."
2013-02-22 18:02:40 +00:00
Dirk Dougherty
47dae0771c
Doc change: Update DC image, fix typo.
...
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
2013-02-22 09:54:45 -08:00
Ian Rogers
afc10e174d
Account malloc mmaped pages as native heap.
...
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.
[1] https://android-review.googlesource.com/#/c/49583/3
Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
2013-02-22 09:40:58 -08:00
Kenny Root
8dda0956b6
am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"
...
* commit '49999acb049e09f99135e412cbb10d7367d2d607':
StreamingZipInflater: fix mmap'd end of read
2013-02-21 16:21:05 -08:00
Kenny Root
49999acb04
Merge "StreamingZipInflater: fix mmap'd end of read"
2013-02-22 00:05:36 +00:00
Dirk Dougherty
959256498a
am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960
am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:25:37 -08:00
Wink Saville
f7bf667d4a
am b5a1ce2f: Merge "Allow three digit phone numbers"
...
* commit 'b5a1ce2f5daa20b5c77113b8887e12dcc05590fc':
Allow three digit phone numbers
2013-02-21 14:21:12 -08:00
Dirk Dougherty
d886d12854
am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'efa92b0bbe906bfac15936e5ab3f75a206cf3d24':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:21:02 -08:00
Dirk Dougherty
efa92b0bbe
am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:18:06 -08:00
