Commit Graph

18171 Commits

Author SHA1 Message Date
Andreas Gampe
512cc91be2 Development/scripts: Update gdbclient for native bridge
The Nexus Player has a mixed abi-list, but native applications are
still x86. Move x86 ahead to prefer it over arm.

Change-Id: I3e2f3dc0da97b94078f7fd5dc3fede711603961a
2015-04-06 13:29:57 -07:00
Doris Liu
fb21ef579d Merge "Add sample code for specifying per-keyframe interpolator in xml" 2015-04-03 17:18:30 +00:00
Trevor Johns
d395e944c5 am 01a33e9d: am 2bffe4f4: am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
* commit '01a33e9d3befb8a65ff65d15a8b174026c5510f6':
  Fix browseable category for NfcProvisioning sample
2015-04-03 14:51:56 +00:00
Doris Liu
2ef936dbae Add sample code for specifying per-keyframe interpolator in xml
Depend on ag/667176
Bug: 19913234

Change-Id: Iaf4160646a972dcc9fd1d885f1ffc0cd68a3b6ac
2015-04-02 18:00:48 -07:00
Trevor Johns
01a33e9d3b am 2bffe4f4: am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
* commit '2bffe4f46b1aa5d9c60d04b911a73b803785e5d2':
  Fix browseable category for NfcProvisioning sample
2015-04-02 23:22:34 +00:00
Trevor Johns
2bffe4f46b am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
* commit 'f4d1982e31b3a27ae19bae89f3981df5ad76394f':
  Fix browseable category for NfcProvisioning sample
2015-04-02 23:11:48 +00:00
Trevor Johns
f4d1982e31 am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
* commit 'eba484fbd45ba57a3fd831a74eb42e398e776cb3':
  Fix browseable category for NfcProvisioning sample
2015-04-02 21:29:31 +00:00
Trevor Johns
eba484fbd4 am 951e7288: Fix browseable category for NfcProvisioning sample
* commit '951e7288e6bea6ed91f510e3cdefc7110b4de353':
  Fix browseable category for NfcProvisioning sample
2015-04-02 21:21:24 +00:00
Trevor Johns
951e7288e6 Fix browseable category for NfcProvisioning sample
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.

Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
2015-04-02 13:29:30 -07:00
Craig Stout
73505e668e am 381fe1c9: Merge "Add BackgroundManager release." into lmp-mr1-ub-dev
* commit '381fe1c9ca7598c65c69737dc2643fd511457277':
  Add BackgroundManager release.
2015-04-02 20:12:07 +00:00
Craig Stout
381fe1c9ca Merge "Add BackgroundManager release." into lmp-mr1-ub-dev 2015-04-02 20:04:11 +00:00
Etan Cohen
0d8fe8b59c Merge "Merge commit 'c84e7b11e598d5a6c07c754755382279e194efcb' into merge" 2015-04-02 03:08:08 +00:00
Chris Craik
1f08b49c92 am 5c783cb0: am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"
* commit '5c783cb0f3d35df0507d61858c845a68ffa1aaa1':
  Fix build - support new systrace file structure
2015-04-01 23:00:23 +00:00
Chris Craik
5c783cb0f3 am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"
* commit '625dde7bdf6726b967733bb8b506734824cd6b5a':
  Fix build - support new systrace file structure
2015-04-01 20:20:26 +00:00
Chris Craik
625dde7bdf am 630b075c: Merge "Fix build - support new systrace file structure"
* commit '630b075cdb4299e72d26d8cb355a28c342479201':
  Fix build - support new systrace file structure
2015-04-01 20:09:59 +00:00
Chris Craik
630b075cdb Merge "Fix build - support new systrace file structure" 2015-04-01 19:50:04 +00:00
Chris Craik
6941c574cf Fix build - support new systrace file structure
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
2015-03-30 18:07:32 -07:00
Trevor Johns
edcf97efa7 am b2c35d15: am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit 'b2c35d1597aace199282148142249a3b14bd95f3':
  Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:12:46 +00:00
Trevor Johns
b2c35d1597 am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '2298d3b48d5bdbb1b6b3e1ea081fede26af7bae0':
  Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:07:15 +00:00
Trevor Johns
2298d3b48d am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '0d473ea178b5120ae45249c4d644cd00e876e63e':
  Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:00:49 +00:00
Trevor Johns
0d473ea178 am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '721cd1b86ac6638b55b0fb20f12695aa32916dd9':
  Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:54:56 +00:00
Etan Cohen
0650f6cdd4 Merge commit 'c84e7b11e598d5a6c07c754755382279e194efcb' into merge 2015-03-30 16:54:20 -07:00
Trevor Johns
721cd1b86a am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
  Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff Update sdk.atree and samples/browseable for lastest samples release
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Chris Banes
70aad0f719 am eb072c1c: Merge "Add hide on scroll demo" into lmp-mr1-ub-dev
* commit 'eb072c1c17334e29a057342d5f5fa6375745fb03':
  Add hide on scroll demo
2015-03-30 20:57:43 +00:00
Chris Banes
eb072c1c17 Merge "Add hide on scroll demo" into lmp-mr1-ub-dev 2015-03-30 20:50:48 +00:00
Dan Albert
99ad31c686 am e1915bdd: am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
* commit 'e1915bdd6302e4ea6abe363d04ad8eba9bbf3df8':
  Allow libbase to be used on Windows.
2015-03-30 18:50:29 +00:00
Dan Albert
e1915bdd63 am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
* commit '3ba45f7871ff9705ed6e994304c44b724feed2a2':
  Allow libbase to be used on Windows.
2015-03-30 18:43:42 +00:00
Dan Albert
3ba45f7871 am 2474617f: Merge "Allow libbase to be used on Windows."
* commit '2474617f0162c7de1c359321071706540983cd2d':
  Allow libbase to be used on Windows.
2015-03-30 18:36:33 +00:00
Dan Albert
2474617f01 Merge "Allow libbase to be used on Windows." 2015-03-30 17:47:20 +00:00
Xavier Ducrohet
b0735703ab am 4da695a3: (-s ours) am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '4da695a3c3aa2bc0e043ff18213959a6875bc122':
2015-03-27 01:38:41 +00:00
Xavier Ducrohet
4da695a3c3 am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '54b50638ad3e36235c917987eccc7255ee1c6308':
2015-03-27 01:23:38 +00:00
Xavier Ducrohet
54b50638ad am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'e9013bf3291c8eeccb1d6f793640b94d30186cf1':
2015-03-27 01:08:48 +00:00
Xavier Ducrohet
e9013bf329 am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '835221bfd3a67629525ae601fce968302c35980d':
2015-03-27 00:48:55 +00:00
Xavier Ducrohet
835221bfd3 am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-27 00:33:32 +00:00
Chih-Hung Hsieh
d6ab5c2552 am 62120b2c: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev
* commit '62120b2c6326762e061ce5cfb75513e5206f92df':
2015-03-26 22:32:00 +00:00
The Android Automerger
76d97aab5e am 66238783: am 7570c73e: am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '66238783b33581e58eeaebbcccf0e26ff48e485c':
  Update version of the build tools to be 22.0.0
2015-03-26 22:31:59 +00:00
Chih-Hung Hsieh
62120b2c63 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev 2015-03-26 21:28:02 +00:00
The Android Automerger
66238783b3 am 7570c73e: am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '7570c73e1014ccd5c49fe2e35bec92d5faa4fb41':
  Update version of the build tools to be 22.0.0
2015-03-26 21:19:45 +00:00
The Android Automerger
7570c73e10 am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit 'dfe61de07eacf1f650911f717b55abb195708033':
  Update version of the build tools to be 22.0.0
2015-03-26 21:00:24 +00:00
Craig Stout
dcaafe81c8 Add BackgroundManager release.
Change-Id: I5a4af31a214f2db26a399db39cf73d578dcbc71c
2015-03-25 09:38:21 -07:00
Pierre Vandwalle
c84e7b11e5 add wifi power calculation
Change-Id: I3176d835454b1324403b844d075709ba277a7189
2015-03-24 19:40:32 -07:00
Xavier Ducrohet
e12e1637ad am c2fd9a35: (-s ours) am 7012c6fc: am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'c2fd9a355ced12edb4e81a0545ee002f70270be8':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 03:25:42 +00:00
Xavier Ducrohet
d8f9b78016 am d9e9e60f: (-s ours) Update build tools version to 22.0.2. DO NOT MERGE.
automerge: 06d9752  -s ours

* commit '06d9752018b749a438db5a21e5d0a3d05725db1e':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 01:37:24 +00:00
Narayan Kamath
d95f8c708c am d3b57a16: am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."
* commit 'd3b57a16b2330fcf29eeb7b00ad189da01dddb54':
  Remove reference to libzipfile.
2015-03-24 01:31:40 +00:00
Chris Banes
6900338db7 am f51cf635: Merge "TextInputLayout and Snackbar demos" into lmp-mr1-ub-dev
* commit 'f51cf635a3daf63a64a16202bf0d36db4777257c':
  TextInputLayout and Snackbar demos
2015-03-24 01:31:26 +00:00
Xavier Ducrohet
c2fd9a355c am 7012c6fc: am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '7012c6fcdb9cf22baa57ea6fb880704f5295635d':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 01:26:58 +00:00
Xavier Ducrohet
06d9752018 am d9e9e60f: (-s ours) Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 01:26:02 +00:00
Xavier Ducrohet
7012c6fcdb am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '7fc65bda5beffc76ff249e59103469c1b46c10f7':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 01:20:53 +00:00
Xavier Ducrohet
7fc65bda5b am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
2015-03-24 01:14:41 +00:00