Commit Graph

18677 Commits

Author SHA1 Message Date
Yusuf Ozuysal
3ffdd09560 am 7615d828: am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/
* commit '7615d828163653f0260bb384b95ec4d06f61fb22':
  Add customtabs support lib to extras/android/support/
2015-08-27 22:17:46 +00:00
Tor Norbye
68b4f8d92f am 51397c4b: am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev
* commit '51397c4b4434d5a375382237ce5fc40db18deb9a':
  Pass in current android.jar to api-generator
2015-08-27 22:17:40 +00:00
Yusuf Ozuysal
7615d82816 am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/
* commit 'ac16badc765571198fbafa7694c991c927643ed7':
  Add customtabs support lib to extras/android/support/
2015-08-27 21:47:57 +00:00
Yusuf Ozuysal
ac16badc76 am e226a0f5: Add customtabs support lib to extras/android/support/
* commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9':
  Add customtabs support lib to extras/android/support/
2015-08-27 21:42:54 +00:00
Yusuf Ozuysal
81a967e47e am 0d364a4d: am 31338f71: (-s ours) am 53ad2de7: Add customtabs support lib to extras/android/support/
* commit '0d364a4d5db96bfb8eb450076ac189a6dbeaab81':
2015-08-27 21:42:15 +00:00
Elliott Hughes
823a507388 am 1f706c7e: am 436f03a0: (-s ours) am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
* commit '1f706c7edbb6843aa284c69226186f644ade7024':
2015-08-27 21:42:13 +00:00
Andreas Gampe
cdacad532c am 9dc995d5: am e4aa7116: (-s ours) am 4cacf112: am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
* commit '9dc995d5f471304d94176d9587f7202dd325a0ed':
2015-08-27 21:42:11 +00:00
Xavier Ducrohet
cc41d4172e am d819e286: (-s ours) am 09bc775a: (-s ours) am 9878bf64: Update build tools version to 23.0.1 -- DO NOT MERGE.
* commit 'd819e286d140621076ff4f63d66ab6dc0d6347a9':
2015-08-27 21:42:10 +00:00
Trevor Johns
ffa8bc3804 am 418143dd: am 10a3cc6f: (-s ours) am 81556478: Sync sample prebuilts for mnc-dev
* commit '418143ddc086e03827bf5addb480f0b21058a65b':
2015-08-27 21:42:08 +00:00
Trevor Johns
0fd44dad1a am b84ffd99: am bb03ef54: (-s ours) am c8e94bf5: Sync mnc-dev sample prebuilts
* commit 'b84ffd99a9a2b647e4e38f2d49e78a7ee33e1aec':
2015-08-27 21:42:06 +00:00
Trevor Johns
bbf651a2d0 am 4b27479c: am 768ab888: (-s ours) am a56a6341: Update sample prebuilts to use latest deps
* commit '4b27479cf20578eb9ca351edb7c1570e277a591f':
2015-08-27 21:42:05 +00:00
Trevor Johns
cde37c74cb am 2ebe1938: (-s ours) am 3ed5edac: (-s ours) am 9a9c2ea5: Bump mnc-dev samples package to v3 (DO NOT MERGE)
* commit '2ebe1938c201e308bdb3f1f58a5bd4f44cf9eba4':
2015-08-27 21:42:03 +00:00
Trevor Johns
4e3910cbc3 am 4a11b75c: am f0946be5: (-s ours) am d95a687e: Sync sample prebuilts for mnc-dev
* commit '4a11b75c9e8a8e0c7a9fcc1dc7647c772640462e':
2015-08-27 21:42:02 +00:00
Dan Willemsen
c140924769 am 6382bc1d: am ab842478: (-s ours) am 283439c7: am d592f8c7: Merge "Remove the mingw package check"
* commit '6382bc1de9ce65458a2e69aa17aba1a76f91a5b0':
2015-08-27 21:42:00 +00:00
Elliott Hughes
baea7983b8 am 5c2d9397: am ace016e1: (-s ours) am 51d2e710: am 944f23ec: Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll"
* commit '5c2d93971436a568ed0f3b7e1f3a8a45eb47d8ca':
2015-08-27 21:41:58 +00:00
Deepanshu Gupta
c4936d7636 am cddd3d34: am 566f438f: (-s ours) am 40bd1993: Update revision for layoutlib and docs.
* commit 'cddd3d343698bfbc75e08cf24a2e3b3aa390f7dc':
2015-08-27 21:41:56 +00:00
Xavier Ducrohet
62d8e985a4 am 5fca5321: am c22011dd: (-s ours) am 3c274b20: Update SDK component versions for the official SDK 23.0.0
* commit '5fca532156b5b6c5a29e2dbc87e99d8a4bb898b8':
2015-08-27 21:41:50 +00:00
Konstantinos Menychtas
a7227dd3fb am 9f8ef17e: am 6db7fc99: (-s ours) am 7cc14006: am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56
* commit '9f8ef17e4a5319f46cdfd701a00b58193e02724f':
2015-08-27 21:41:46 +00:00
Nick Kralevich
6c5f3e57cc am 7da6fbcb: am 5b3b2193: (-s ours) am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts
* commit '7da6fbcb9a77b72da09a78c9fded6514e60ee06f':
2015-08-27 21:41:44 +00:00
Konstantinos Menychtas
5d1daea41d am 0fcc0123: am d1d8a50d: (-s ours) am f6cf3cdd: am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df
* commit '0fcc01237018223da0db248ef777e314bbc556f0':
2015-08-27 21:41:42 +00:00
Nick Kralevich
95a1e61e15 am 5ffcf2a6: am 628877cc: (-s ours) am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd t
* commit '5ffcf2a67ce3a548ff04ac9734209e357bd012dd':
2015-08-27 21:41:40 +00:00
Konstantinos Menychtas
90715006d8 am fe8a431b: am 268ca6d5: (-s ours) am 756650ce: am 8484c46a: (-s ours) am 7f3cb054: am 20f4cf0b: am 4b70b572: am 2032317a: am 73e98d27: (-s ours) am 0878662f: am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8
* commit 'fe8a431b9c32caad60fc7b02049b982e8e9c9930':
2015-08-27 21:41:37 +00:00
Konstantinos Menychtas
e717711eb9 am 7d9844b7: am 520a2472: (-s ours) am 8cfb8f1f: am 7af114e3: (-s ours) am e8158a85: am cdb21d5f: am 6dac7dff: am 6c65c2f5: am 895ff7f3: (-s ours) am 9780219a: am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d
* commit '7d9844b7785f68d6878001c1e3957edcf54787d5':
2015-08-27 21:41:32 +00:00
Konstantinos Menychtas
717c1c4fae am 2cb2cc7f: am 081b297c: (-s ours) am 7eebbae9: am 90fdef7e: (-s ours) am d15073bb: am 0d68aeab: am d49bca70: am a944d9a6: am 30461421: (-s ours) am 6285d756: am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac461
* commit '2cb2cc7f93be44bf6390277939fa87eab29ebc42':
2015-08-27 21:41:27 +00:00
Konstantinos Menychtas
f25370316f am 7d9fe56d: (-s ours) am 2332a79d: (-s ours) am e8016665: am eb4cef2a: (-s ours) am 251bb36d: am ceef025b: am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revisio
* commit '7d9fe56d02cf6e6c3d8af734daaa6b0f73fa9d0a':
2015-08-27 21:41:24 +00:00
Nick Kralevich
021600d5a1 am 7a8eb228: am 3fdcce13: (-s ours) am b07478d7: am c1925e98: am dd48de4d: am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev
* commit '7a8eb2286ed4b179b6c94f85932fec574817eeb4':
2015-08-27 21:41:22 +00:00
Konstantinos Menychtas
fbd4e1d117 am a985f3ee: am 7168c7db: (-s ours) am 3ab6703b: am ea9fe7e5: (-s ours) am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev
* commit 'a985f3eea138db3606467e057de0dd9a05092497':
2015-08-27 21:41:19 +00:00
Konstantinos Menychtas
0e67feda09 am 4197c279: (-s ours) am 310180a9: (-s ours) am 28aafa0d: am c631e5b2: (-s ours) am 6bf2b78e: am fc4964b9: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '4197c279e354292c31d15d5f3fa5d77b6c134695':
2015-08-27 21:41:17 +00:00
Dake Gu
f8a2f307c0 am e5304a47: am 498117d7: (-s ours) am 6ad53c99: Merge "BrowseErrorFragment: fix NPE of not attached BackgroundManager" into mnc-dev
* commit 'e5304a47541cef29b166ac7aac56c016d89c4180':
2015-08-27 21:41:15 +00:00
Ying Wang
ca880a90ab am 2ae90eaa: am 87108c85: (-s ours) resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp
* commit '2ae90eaa5adafbde7e09c29d8dd8a0a9f552744d':
2015-08-27 21:41:12 +00:00
Dianne Hackborn
44e9173e7c am 9a70376e: am 3e845dce: (-s ours) am 424fb606: Change MNC codename to just M.
* commit '9a70376e29adcb549ff3d0ac1f27473736f84808':
2015-08-27 21:41:02 +00:00
Marco Nelissen
ff0e69a0eb am a4937792: am c4050f2e: (-s ours) am 9146cbdb: Merge "Fix CRCs in file so it passes the new CRC check" into mnc-dev
* commit 'a493779269079f93fc3f187b3fb756320eddc459':
2015-08-27 21:40:58 +00:00
Miao Wang
61bff62187 am 53503e13: am d71980d9: (-s ours) am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so
* commit '53503e13cd19f26807a9176e8768f08adf25be13':
2015-08-27 21:40:56 +00:00
Paul Miller
d593238129 am 076db30c: am bccba878: (-s ours) am 2a6d5a10: am 6ae8b0bf: Merge "Remove references to Browser tests"
* commit '076db30c9d9833e86c5ef8e5dda0cda02253700f':
2015-08-27 21:40:53 +00:00
Elliott Hughes
48d49a853f am f2d09c37: am 066f1d4f: (-s ours) am fe595a00: am 7a734ced: Merge "Warn if you\'re trying to use gdbclient without "adb root"."
* commit 'f2d09c37aa3719153e99c7f09324090cee71746a':
2015-08-27 21:40:51 +00:00
Xavier Ducrohet
5f1c1c218f am ac9cc31d: am 0d88d857: (-s ours) am a58a751c: Update revision for next SDK Preview.
* commit 'ac9cc31df83d58a85562e39a5bac854d8a36c951':
2015-08-27 21:40:48 +00:00
Deepanshu Gupta
b7a84909d1 am 73f98631: am 37c31791: (-s ours) am 5c05f4ef: Merge "Update LayoutLib revision number for Preview 3" into mnc-dev
* commit '73f98631eef243b85419b9dbf0bbdd7a386fa5cb':
2015-08-27 21:40:39 +00:00
Konstantinos Menychtas
74b8acbc94 am 0738486c: (-s ours) am 4544340c: (-s ours) am 1bdf0eee: Merge "DO NOT MERGE Increase the system-image revision number after opengl bug fix" into mnc-dev
* commit '0738486ced5ea8e7f8587cacb9a2fd329d5e3491':
2015-08-27 21:40:34 +00:00
Siva Velusamy
3f8140d5e7 am 329d004c: am 29a54ec9: (-s ours) am 4518f725: Update platform tools 23.0.0 rc4 -> rc5
* commit '329d004cee8d9035a3317a7372720ca71b8d175e':
2015-08-27 21:40:30 +00:00
Chris Craik
553d662076 am 457aab02: am bc7cbbcf: (-s ours) am 9d78bc10: Support new systrace file structure
* commit '457aab02b7be5ade183f7b063c72164eae69d806':
2015-08-27 21:40:28 +00:00
Dianne Hackborn
a222be5027 am c9ee9c39: am e2fa6ed8: (-s ours) am d574af02: Track reason for screen turning on.
* commit 'c9ee9c39b6949372fcb8b76b5f1c7daef1e581a3':
2015-08-27 21:40:26 +00:00
Xavier Ducrohet
8305382259 am 645c17fa: am 9a20c8a8: (-s ours) am f8c219e0: am 73190f3f: (-s ours) Update version of non-maven support package.
* commit '645c17faba8a24f2682848c5c2cc0e3d5fc43115':
2015-08-27 21:40:23 +00:00
Jonathan Basseri
9fc4d88ad3 am c8dfc914: am b05f9447: (-s ours) am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev
* commit 'c8dfc9148f33ca5e4a28e9032eb7d3901a761777':
2015-08-27 21:40:19 +00:00
Vadim Tryshev
045fa4faac am 8253275e: am 1d8a75b0: (-s ours) am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev
* commit '8253275e433394d2c3840c66ce18797254e99a62':
2015-08-27 21:40:11 +00:00
Elliott Hughes
dc3caa5fa9 am fd521f4a: am 88c74baa: (-s ours) am 2b9d34e1: am 73371e58: Merge "Fix gdbclient to work with emulator builds"
* commit 'fd521f4a2480a97ede2082dd2a2d6f6ba0419e5f':
2015-08-27 21:40:07 +00:00
Santos Cordon
dc28a82517 am 25c70169: am eb0ae402: (-s ours) am 0aafaa70: Add calllog CTS tests.
* commit '25c7016919df7e6525a5c596f243fb0ac88b2244':
2015-08-27 21:40:03 +00:00
Benjamin Weiss
4e8fe73dce am bfb52300: am be0cc8fb: (-s ours) am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
* commit 'bfb523009ef9520790be39b96952322c140f3400':
2015-08-27 21:40:01 +00:00
Trevor Johns
75c344a6b8 am 65400b5f: (-s ours) am 87bea24f: (-s ours) am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit '65400b5f38921a4efe3c7e0af4acc922d2dca4a6':
2015-08-27 21:39:58 +00:00
Tor Norbye
51397c4b44 am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev
* commit '1f2c59aff8691075606294dc8feb6d3979d46a7b':
  Pass in current android.jar to api-generator
2015-08-27 21:27:15 +00:00
Tor Norbye
1f2c59aff8 Merge "Pass in current android.jar to api-generator" into mnc-ub-dev 2015-08-27 20:59:16 +00:00