Elliott Hughes
6b50c254ba
am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue."
...
* commit 'e7c31ba1429c16bce8b990a06f9667680a4fe052':
Add missing <stdlib.h> include to the native app glue.
2015-02-20 17:02:27 +00:00
Elliott Hughes
e7c31ba142
Merge "Add missing <stdlib.h> include to the native app glue."
2015-02-20 16:58:15 +00:00
Chris Banes
2ff5cc9671
am 7114b925: am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
...
* commit '7114b925b6e0f8fb5f07b75d0a9c00da0aeb2acc':
AlertDialog Demo
2015-02-20 12:18:53 +00:00
Chris Banes
822d9f209f
am 8f95e8d7: am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
...
* commit '8f95e8d7ab037e723942350999745c230f978d6f':
Add ActionMode demos to Support7Demos
2015-02-20 12:12:47 +00:00
Chris Banes
7114b925b6
am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
...
* commit '531ebcdc40909b21c64d5b7f740f2201a9a8cbd5':
AlertDialog Demo
2015-02-20 12:12:42 +00:00
Chris Banes
531ebcdc40
am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
...
* commit '2797e1a4019ba3f6c0663930ac28c3fd65d84692':
AlertDialog Demo
2015-02-20 12:06:44 +00:00
Chris Banes
8f95e8d7ab
am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
...
* commit '97919fdfb9c8bf1e23b1e0e22939ef330eddeca8':
Add ActionMode demos to Support7Demos
2015-02-20 12:06:30 +00:00
Chris Banes
2797e1a401
Merge "AlertDialog Demo" into lmp-mr1-ub-dev
2015-02-20 12:00:52 +00:00
Chris Banes
97919fdfb9
am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
...
* commit 'ee2eb13f4543dae24252bac8d3273c6acfb33329':
Add ActionMode demos to Support7Demos
2015-02-20 11:59:37 +00:00
Chris Banes
ee2eb13f45
Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
2015-02-20 11:56:12 +00:00
Elliott Hughes
cdf349cf11
Add missing <stdlib.h> include to the native app glue.
...
On LP64, this could have caused the top bits of the pointer returned by
malloc to be lost because sizeof(int) != sizeof(void*).
Change-Id: I866a5071c1d359478d020d7fa4d466b53d52edab
2015-02-19 22:41:50 -08:00
Bill Yi
7798f331bc
am bd436549: am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD
...
* commit 'bd4365494578e2f888df8789f458f66463b52781':
2015-02-20 00:36:50 +00:00
Bill Yi
bd43654945
am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD
...
* commit '35eb9ae37e8b9e2c6ff5ce4a14d17998cf3c2ad7':
2015-02-20 00:22:59 +00:00
Bill Yi
35eb9ae37e
Merge commit '418d8cac94a1e5f5dad0ee232197f2453a595c14' into HEAD
2015-02-19 14:30:37 -08:00
Craig Stout
8f295cdef4
Updated to clarify division of functionality.
...
PlaybackControlHelper can be used in BrowseFragment.
Change-Id: Iac37e0a4f51ed1fab5edcff20d4a7037d4cc9ef9
2015-02-19 11:10:23 -08:00
bohu
1ff7d2032d
am df7fdad9: am 0dd684b2: am 505d46bc: am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-m
...
* commit 'df7fdad94fdfac68d0bc81d966961784da7832dc':
Bump revision number for all system images
2015-02-18 11:38:11 +00:00
bohu
a058339f22
am 7f985a3b: am fdabca67: am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '7f985a3b5a6f0d1d55b77b4545c947ac9ec6167c':
back port gles fix to api 17
2015-02-18 11:38:09 +00:00
bohu
f4b5235004
am 884e3034: am b932d0ce: am 8d65d5ff: am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '884e30343efab49f35c41b969ca5f7a6fa3c8748':
Bump revision number for all the system images
2015-02-18 11:38:08 +00:00
bohu
31727bacd7
am 6283f598: am e1c81876: am 3e449dec: am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '6283f5986a26d4feef821582b5891b492859054f':
Bump revision number for system images
2015-02-18 11:38:06 +00:00
bohu
df7fdad94f
am 0dd684b2: am 505d46bc: am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '0dd684b2229e1486ee68cbb8578faf5374b47b1c':
Bump revision number for all system images
2015-02-18 00:49:06 +00:00
bohu
7f985a3b5a
am fdabca67: am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit 'fdabca678706b3d8133d9c37e092c59fdff54b07':
back port gles fix to api 17
2015-02-18 00:49:05 +00:00
bohu
884e30343e
am b932d0ce: am 8d65d5ff: am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit 'b932d0ceb47cc1dd9da1623fd3c9f7c8065a7b81':
Bump revision number for all the system images
2015-02-18 00:49:03 +00:00
bohu
6283f5986a
am e1c81876: am 3e449dec: am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'e1c8187616aa750cf08c16f5c1b96c03b4a7015b':
Bump revision number for system images
2015-02-18 00:49:02 +00:00
bohu
0dd684b222
am 505d46bc: am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '505d46bca73e144c32270237e02f7a9b33263ab2':
Bump revision number for all system images
2015-02-18 00:41:47 +00:00
bohu
fdabca6787
am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '986ba2fb036445d8723a52f5f47d37d6ff50fabc':
back port gles fix to api 17
2015-02-18 00:41:46 +00:00
bohu
b932d0ceb4
am 8d65d5ff: am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '8d65d5ff0aec24f9e8e9d160a870cb8ec532bf74':
Bump revision number for all the system images
2015-02-18 00:41:45 +00:00
bohu
e1c8187616
am 3e449dec: am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '3e449deca2614c4fbfe0af4e4f43f5bc4ff30804':
Bump revision number for system images
2015-02-18 00:41:44 +00:00
bohu
505d46bca7
am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '6d2c23850e6905fe02f01564e3ae74eef478e045':
Bump revision number for all system images
2015-02-18 00:31:33 +00:00
bohu
986ba2fb03
am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '08898593f2c035bd6280230068db1aac4308bcd8':
back port gles fix to api 17
2015-02-18 00:31:32 +00:00
bohu
8d65d5ff0a
am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '20601c6a317d44cc5545ab9528c826021cbaf357':
Bump revision number for all the system images
2015-02-18 00:31:30 +00:00
bohu
3e449deca2
am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '36bff11258d26f6e9046d8f3cfffa516e27769de':
Bump revision number for system images
2015-02-18 00:31:29 +00:00
Craig Stout
321933a007
am 3b3cd1df: am 532dc1f4: am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
...
* commit '3b3cd1dfe85e5f72d3ede75b9ece5b12756d59a6':
Add backgrounds.
2015-02-18 00:30:17 +00:00
Elliott Hughes
6243e0ec4b
am 5f454f03: am 19fbca0a: Merge "Remove elftree."
...
* commit '5f454f031f14362846c782e3862d4a9c0b56c9e0':
Remove elftree.
2015-02-18 00:28:37 +00:00
Elliott Hughes
c5997d72dd
am fe7c8b69: am 7a35b085: Merge "Use the exported elfutils headers."
...
* commit 'fe7c8b693ddd8b4250cdb0dd0e5815966ddd0c20':
Use the exported elfutils headers.
2015-02-18 00:28:28 +00:00
Elliott Hughes
cbcbb5539d
am a865d35c: am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit 'a865d35c48a9239980a589eaf5974333fbb32e79':
Clean cruft out of the elftree makefile.
2015-02-18 00:28:21 +00:00
bohu
6d2c23850e
am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'b45bd0a4fa4467b96c2ca64c908268896e502fa9':
Bump revision number for all system images
2015-02-18 00:25:06 +00:00
bohu
08898593f2
am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit 'b71024a60165e45f896357705714b3bad4021a52':
back port gles fix to api 17
2015-02-18 00:25:05 +00:00
bohu
20601c6a31
am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '6a06fb6f66e554b176887f7045afd2d52c40c4a4':
Bump revision number for all the system images
2015-02-18 00:25:04 +00:00
bohu
36bff11258
am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '3ce7eb80550ee884b3aa72a0165d888938fb5a6e':
Bump revision number for system images
2015-02-18 00:25:03 +00:00
Craig Stout
3b3cd1dfe8
am 532dc1f4: am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
...
* commit '532dc1f4f02898a379308a2652f4c182e8cc4fb9':
Add backgrounds.
2015-02-17 22:56:50 +00:00
Craig Stout
532dc1f4f0
am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
...
* commit '006d835209a78de14e26ee33364000046082cdcb':
Add backgrounds.
2015-02-17 22:48:44 +00:00
Craig Stout
006d835209
Merge "Add backgrounds." into lmp-mr1-ub-dev
2015-02-17 22:42:00 +00:00
Elliott Hughes
5f454f031f
am 19fbca0a: Merge "Remove elftree."
...
* commit '19fbca0a9d73841a5cf9c7265e4711e0ed2cdf23':
Remove elftree.
2015-02-17 21:36:01 +00:00
Elliott Hughes
19fbca0a9d
Merge "Remove elftree."
2015-02-17 21:25:18 +00:00
Elliott Hughes
33937e0edf
Remove elftree.
...
Other than the original commit (from an author who's long gone), the
only people who've ever touched elftree are us, fixing the build on
many different occasions. It's not referenced anywhere else in the
tree, so let's find out if anyone's actually using it...
Change-Id: I5c6163064d64ba686b796f7886b19cf330069a94
2015-02-17 13:22:33 -08:00
Elliott Hughes
fe7c8b693d
am 7a35b085: Merge "Use the exported elfutils headers."
...
* commit '7a35b08548fbdadd43b79f98297d0d7cf2fea1c5':
Use the exported elfutils headers.
2015-02-17 21:16:59 +00:00
Elliott Hughes
a865d35c48
am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit '092ddc95f04c74ebd928c194e7a7af113f7a0337':
Clean cruft out of the elftree makefile.
2015-02-17 21:09:41 +00:00
Elliott Hughes
7a35b08548
Merge "Use the exported elfutils headers."
2015-02-17 21:03:32 +00:00
Elliott Hughes
092ddc95f0
Merge "Clean cruft out of the elftree makefile."
2015-02-17 20:57:25 +00:00
bohu
b45bd0a4fa
am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'fbfb579487c597400ede7fc206d2305e013656ee':
Bump revision number for all system images
2015-02-17 18:46:57 +00:00
