Commit Graph

19393 Commits

Author SHA1 Message Date
Chris Banes
330c81ad9b Merge "Make sample use TextInputEditText" into mnc-ub-dev
am: 39eac83a81

* commit '39eac83a81af1b0f1c0f6b0c79378f9392ed7efc':
  Make sample use TextInputEditText
2016-01-14 11:02:08 +00:00
Chris Banes
39eac83a81 Merge "Make sample use TextInputEditText" into mnc-ub-dev 2016-01-14 10:58:41 +00:00
Yuichi Araki
04491e0f9d Merge "Use of bottom sheet with ScrollView in background" into mnc-ub-dev
am: 8abd4451a9

* commit '8abd4451a9beb36c299212389693a8134350c1cd':
  Use of bottom sheet with ScrollView in background
2016-01-14 03:45:03 +00:00
Yuichi Araki
8abd4451a9 Merge "Use of bottom sheet with ScrollView in background" into mnc-ub-dev 2016-01-14 03:41:30 +00:00
Dimitry Ivanov
fd2e56602f Merge changes I388100b1,Iefff94c4 am: b01728f119
am: fff86a9fe2

* commit 'fff86a9fe2069257ffc992af891ee48b2c0089ae':
  Remove symbols which are not in platform libm.so
  Remove symbols that are not in platform libc.so
2016-01-14 02:11:11 +00:00
Dimitry Ivanov
fff86a9fe2 Merge changes I388100b1,Iefff94c4
am: b01728f119

* commit 'b01728f1192da250b3da658395b8aa28003713bd':
  Remove symbols which are not in platform libm.so
  Remove symbols that are not in platform libc.so
2016-01-14 02:08:32 +00:00
Dimitry Ivanov
b01728f119 Merge changes I388100b1,Iefff94c4
* changes:
  Remove symbols which are not in platform libm.so
  Remove symbols that are not in platform libc.so
2016-01-14 01:39:34 +00:00
Dimitry Ivanov
977bf48381 Remove symbols which are not in platform libm.so
Bug: http://b/26236057
Change-Id: I388100b14346bcf24eba12ad452f2e16676ee756
2016-01-13 17:32:12 -08:00
Dimitry Ivanov
8b554e7ec7 Remove symbols that are not in platform libc.so
Bug: http://b/26236057
Change-Id: Iefff94c4210732b695b77a58fb6f481d810811ee
2016-01-13 17:32:12 -08:00
Dimitry Ivanov
f7c63fce48 Merge "Remove LIBC_PRIVATE symbols from libm" am: 4febace41e
am: 72232735f5

* commit '72232735f5c14c9b5a0cbf1dfabc7f903e3e0b7b':
  Remove LIBC_PRIVATE symbols from libm
2016-01-13 23:06:51 +00:00
Dimitry Ivanov
72232735f5 Merge "Remove LIBC_PRIVATE symbols from libm"
am: 4febace41e

* commit '4febace41ed695c0168d2f66d5b9d1141a492212':
  Remove LIBC_PRIVATE symbols from libm
2016-01-13 20:23:13 +00:00
Dimitry Ivanov
4febace41e Merge "Remove LIBC_PRIVATE symbols from libm" 2016-01-13 19:54:25 +00:00
Dimitry Ivanov
34109a7109 Remove LIBC_PRIVATE symbols from libm
Bug: http://b/26234924
Change-Id: I3b1b764f87e0b6be33c1e761ee883e1d07578323
2016-01-13 10:53:47 -08:00
Dake Gu
8734875c94 Merge "SupportLeanbackDemo: demo of custom theme of ImageCardView" into mnc-ub-dev
am: 5df19367bb

* commit '5df19367bb7bf4c63de8906dc73ebddeb727e7ea':
  SupportLeanbackDemo: demo of custom theme of ImageCardView
2016-01-13 18:50:01 +00:00
Dake Gu
5df19367bb Merge "SupportLeanbackDemo: demo of custom theme of ImageCardView" into mnc-ub-dev 2016-01-13 18:44:02 +00:00
Chris Banes
079eca8847 Make sample use TextInputEditText
Change-Id: Ic995fa3086316ddb19b1b3929d5142091331f469
2016-01-13 16:24:13 +00:00
Yuichi Araki
6dc55051fc Use of bottom sheet with ScrollView in background
Bug: 26237244
Change-Id: I79d500ce1262021368aeb4693246bbc6bba8c6e7
2016-01-13 20:02:53 +09:00
Dake Gu
fef904e212 GuidedStepFragment: add test for icon
am: c77aa4f798

* commit 'c77aa4f798bc0b6a2d20f22406ccff26135be638':
  GuidedStepFragment: add test for icon
2016-01-12 18:53:26 +00:00
Dimitry Ivanov
a8c3bc4ebb Merge "Restore bsd_signal for android-20 and below" am: 8aefb3d14b
am: 13308c50f4

* commit '13308c50f4f7be454bb9a0cb02435b2af87d890c':
  Restore bsd_signal for android-20 and below
2016-01-12 04:41:20 +00:00
Dimitry Ivanov
33dbd07be8 Merge "Replace __page_size reference with PAGE_SIZE for android-12 and below" am: d7e48190cf
am: 80931e4689

* commit '80931e46895b97e439eb7f8eb2f288d669882b13':
  Replace __page_size reference with PAGE_SIZE for android-12 and below
2016-01-12 04:41:11 +00:00
Dimitry Ivanov
13308c50f4 Merge "Restore bsd_signal for android-20 and below"
am: 8aefb3d14b

* commit '8aefb3d14be714a61ae74edc72595601ff848d51':
  Restore bsd_signal for android-20 and below
2016-01-12 04:39:25 +00:00
Dimitry Ivanov
8aefb3d14b Merge "Restore bsd_signal for android-20 and below" 2016-01-12 04:35:46 +00:00
Dake Gu
c77aa4f798 GuidedStepFragment: add test for icon
Bug 26473407

Change-Id: I2f59fe2d869c39c802a6451533a49f6682cdef8a
2016-01-11 16:00:33 -08:00
Dimitry Ivanov
10936c3aa1 Restore bsd_signal for android-20 and below
Also fix sort order in couple of files.

Bug: http://b/26475271
Change-Id: I75775ded99edd313e9ea31f0b3b4de03096be482
2016-01-11 13:50:48 -08:00
Dimitry Ivanov
80931e4689 Merge "Replace __page_size reference with PAGE_SIZE for android-12 and below"
am: d7e48190cf

* commit 'd7e48190cff0d747874df5d92ad6c31b5e95130b':
  Replace __page_size reference with PAGE_SIZE for android-12 and below
2016-01-11 18:05:51 +00:00
Dimitry Ivanov
d7e48190cf Merge "Replace __page_size reference with PAGE_SIZE for android-12 and below" 2016-01-11 17:58:56 +00:00
Dimitry Ivanov
11ae5ebfb6 Replace __page_size reference with PAGE_SIZE for android-12 and below
Also remove __getpageshift since it is not present in later version of
android (>12)

Bug: http://b/26475272
Bug: https://github.com/android-ndk/ndk/issues/1
Change-Id: I117194ede3b13a63ff020364b0f573fb25d5205d
2016-01-09 14:16:13 -08:00
Dan Albert
f8e5c1df22 Merge "Add NOTICE files for our projects." am: 21cb8b421f
am: 7fc42864ca

* commit '7fc42864ca387be9ec30496812fcab98f1e93248':
  Add NOTICE files for our projects.
2016-01-08 21:53:08 +00:00
Dan Albert
7fc42864ca Merge "Add NOTICE files for our projects."
am: 21cb8b421f

* commit '21cb8b421f1dababd2625ed571a95ff3dcb69487':
  Add NOTICE files for our projects.
2016-01-08 21:50:52 +00:00
Dan Albert
21cb8b421f Merge "Add NOTICE files for our projects." 2016-01-08 21:45:59 +00:00
Dan Albert
7000f03bce Add NOTICE files for our projects.
Bug: http://b/25592257
Change-Id: I4bdd59c30ce1ecca68c7aa133b4a32afb72927cf
2016-01-08 13:43:53 -08:00
Alan Viverette
0a03148d3a Merge "Update ApiDemos control samples for Material" 2016-01-08 18:33:15 +00:00
Dimitry Ivanov
1d29b7c757 Merge "Add missing __gnu_Unwind_Find_exidx symbol" am: 80b7a70c3e
am: c30fb5beab

* commit 'c30fb5beabf8cf3a2b793205fad18e76b72c795e':
  Add missing __gnu_Unwind_Find_exidx symbol
2016-01-08 18:21:45 +00:00
Dimitry Ivanov
c30fb5beab Merge "Add missing __gnu_Unwind_Find_exidx symbol"
am: 80b7a70c3e

* commit '80b7a70c3efd5b0bb9034cc2e2a43a97d7955f5f':
  Add missing __gnu_Unwind_Find_exidx symbol
2016-01-08 18:19:40 +00:00
Dimitry Ivanov
80b7a70c3e Merge "Add missing __gnu_Unwind_Find_exidx symbol" 2016-01-08 18:11:15 +00:00
Dimitry Ivanov
eb7c104c90 Add missing __gnu_Unwind_Find_exidx symbol
Also since __aeabi* and __gnu_Unwind_Find_exidx symbols
were incorrectly versioned in M (android-23) remove them from
the version script for all platform versions <= 23

Bug: https://github.com/android-ndk/ndk/issues/1
Change-Id: I04902aac25a722100fc502600df908bb3a786356
2016-01-08 10:03:09 -08:00
Deepanshu Gupta
db2b163581 Merge changes from topic 'asm5'
* changes:
  Update mkstubs to Java 8.
  Upgrade to ASM 5
2016-01-08 17:37:57 +00:00
Deepanshu Gupta
b916791be8 Update mkstubs to Java 8.
Also remove eclipse project, add intellij project and start using ASM5
API.

Change-Id: I761965fe641879a606d5ec4f0cec0781087e4c20
2016-01-08 08:48:36 -08:00
Yohann Roussel
ef8789ea47 Merge "Build android-stubs-current.jack with Jack" am: 1328b856dd
am: 17cf210d64

* commit '17cf210d64809c6a10faec6c3f912d4c7f2254e4':
  Build android-stubs-current.jack with Jack
2016-01-08 08:57:25 +00:00
Yohann Roussel
17cf210d64 Merge "Build android-stubs-current.jack with Jack"
am: 1328b856dd

* commit '1328b856dd878dba2b32da69f57a3ea703538bca':
  Build android-stubs-current.jack with Jack
2016-01-08 08:55:41 +00:00
Yohann Roussel
1328b856dd Merge "Build android-stubs-current.jack with Jack" 2016-01-08 08:50:48 +00:00
Deepanshu Gupta
3162d05475 Upgrade to ASM 5
Change-Id: I5c8bbc67017b7de49a9cb34514c087ed2f536495
2016-01-07 16:57:36 -08:00
Alan Viverette
bfd633ad65 Update ApiDemos control samples for Material
Adds examples for a variety of Material-only control styles including
underlined Spinner and discrete SeekBar. Groups controls into cards.

For the old-style controls, moves some run-time setup tasks into XML.

Bug: 19352193
Change-Id: Ibb1c82ac6ecaca3b93f3acfd65ef67cd9784fef4
2016-01-07 16:41:10 -05:00
Alex Light
b289480b84 Merge "Make gdbclient respect custom OUT_DIR settings" am: 7c776a4fb3
am: 7d239c043e

* commit '7d239c043e07367e71bb2a92589739f7ed8f438e':
  Make gdbclient respect custom OUT_DIR settings
2016-01-07 18:12:24 +00:00
Alex Light
7d239c043e Merge "Make gdbclient respect custom OUT_DIR settings"
am: 7c776a4fb3

* commit '7c776a4fb31cf38596e701fadf424abb5f37364d':
  Make gdbclient respect custom OUT_DIR settings
2016-01-07 18:10:00 +00:00
Alex Light
7c776a4fb3 Merge "Make gdbclient respect custom OUT_DIR settings" 2016-01-07 18:05:26 +00:00
Yohann Roussel
e9dcc69da9 Build android-stubs-current.jack with Jack
Instead of using Jill.

Bug: 26415660

Change-Id: I316f013a16458fa8201fba6695d974b9afa0cc3c
2016-01-07 11:08:29 +01:00
Dimitry Ivanov
889aa7a71d Merge "android-21: add version scripts for libc/m/dl" am: c67f5d0539
am: b7fb6ca6d0

* commit 'b7fb6ca6d03036a32ce62897e9a92df68f56b6c8':
  android-21: add version scripts for libc/m/dl
2016-01-06 18:34:40 +00:00
Dimitry Ivanov
b7fb6ca6d0 Merge "android-21: add version scripts for libc/m/dl"
am: c67f5d0539

* commit 'c67f5d05398f97fdce6649ef4720fd639a53c9b2':
  android-21: add version scripts for libc/m/dl
2016-01-06 18:31:14 +00:00
Dimitry Ivanov
c67f5d0539 Merge "android-21: add version scripts for libc/m/dl" 2016-01-06 18:24:54 +00:00