Dirk Dougherty
|
7460318438
|
am 8cf4a18d: am 5d3e2da9: (-s ours) am 26b3ec5a: am 0da02191: am aee6585c: Update js/css versions and add pt-br.
* commit '8cf4a18d9726d0405e24ff460b54067697b2dbbd':
|
2015-08-27 14:08:37 +00:00 |
|
Dirk Dougherty
|
b4e68d7566
|
am 3ddce958: am 49801ef8: (-s ours) am bb18cb1a: am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '3ddce958e3771916742d9e12f8b6ba5360aaa3ba':
|
2015-08-27 14:08:35 +00:00 |
|
Tao Bao
|
6af9f9d4bd
|
am 2ebde385: am e9c462b0: (-s ours) am 1747e35a: am a0021026: Merge "fix up ota_from_target_files symlink detection."
* commit '2ebde3859c3ef76d4bc3e3b5310c07e118b5927f':
|
2015-08-27 14:08:32 +00:00 |
|
Tao Bao
|
c0b0e0b689
|
am 2e357348: am c607474e: (-s ours) am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
* commit '2e3573483f59223559503b690cc3d41161ce3104':
|
2015-08-27 14:08:29 +00:00 |
|
dcashman
|
df04ab9ec0
|
am a626d9f1: am e7733e55: (-s ours) am 2a3a2dc3: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
* commit 'a626d9f1a4fd27b357b6371032660e94f9088d4d':
|
2015-08-27 14:08:26 +00:00 |
|
Tao Bao
|
044bd31e50
|
am 575643a8: am 14342066: Merge "Add unit tests for rangelib.py."
* commit '575643a85d41a428aeda6676146d86b0356e0785':
Add unit tests for rangelib.py.
|
2015-08-27 12:40:31 +00:00 |
|
Tao Bao
|
575643a85d
|
am 14342066: Merge "Add unit tests for rangelib.py."
* commit '14342066dbaec25593c12fdba5396d4ca9cad841':
Add unit tests for rangelib.py.
|
2015-08-27 05:23:08 +00:00 |
|
Ying Wang
|
e83e3d0b6a
|
am a4794598: am c586468d: am 27bc97e6: am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit 'a4794598ccbd3d9c16d182a0fe02cceb2f675814':
Don't fail build of otatools if there are no device certificates
|
2015-08-27 05:18:26 +00:00 |
|
Ying Wang
|
fd96ce73bc
|
am 3995bde3: am 43aff506: am a5223697: am d0cc11e8: am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '3995bde3a37d97433343c92fea1ab457f07c9990':
Dist the otatools package.
|
2015-08-27 05:18:25 +00:00 |
|
Tao Bao
|
c314b8ce32
|
am 8b528fc3: (-s ours) am 68319cdf: am 95708eea: Merge "Split large files for BBOTA v3."
* commit '8b528fc3ef7516b53f74b37e4fb709b254471587':
|
2015-08-27 05:02:36 +00:00 |
|
Bart Sears
|
a47dd9727e
|
am 4535d7cb: (-s ours) am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '4535d7cb345d82b627030eb19fc12c3ac6e95676':
|
2015-08-27 05:02:34 +00:00 |
|
Tao Bao
|
12eaafd9cf
|
am 967b52fb: (-s ours) am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
* commit '967b52fb0b4589275d347f8e76bd3fcc9bb209a4':
|
2015-08-27 05:02:33 +00:00 |
|
Nick Kralevich
|
66270b69d4
|
am 64e4d8a2: (-s ours) am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
* commit '64e4d8a211546cde5ff5d4dea8ef69c86ed38067':
|
2015-08-27 05:02:31 +00:00 |
|
Konstantinos Menychtas
|
b5edbf8679
|
am d2524d00: (-s ours) am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
* commit 'd2524d00c284e1c7d3735d6ce49e49ed90d223fc':
|
2015-08-27 05:02:30 +00:00 |
|
Ying Wang
|
cfab01b310
|
am c9343c0b: (-s ours) am cf129c53: am a7eaf450: Merge "Dist the otatools package."
* commit 'c9343c0bc316536772700926d555be42783fac62':
|
2015-08-27 05:02:29 +00:00 |
|
Tom Cherry
|
f6e07c1c87
|
am 00c9b1b3: (-s ours) am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '00c9b1b3239ea5882a9089d0a81079cae6bdf5ae':
|
2015-08-27 05:02:27 +00:00 |
|
smain@google.com
|
8fbcdcaace
|
am 6e0cca08: (-s ours) am ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the
* commit '6e0cca08763c831176c2f65bbde8bd90668304fe':
|
2015-08-27 05:02:26 +00:00 |
|
Christopher Wiley
|
8a3dd00f23
|
am 3f7c5424: (-s ours) am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml"
* commit '3f7c5424dbbf5b827ed912a5383bdc31dced7cec':
|
2015-08-27 05:02:24 +00:00 |
|
Shinichiro Hamaji
|
41374088f5
|
am 8a0607f0: (-s ours) am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set"
* commit '8a0607f0695b24d73d77c3915ebe29229f732079':
|
2015-08-27 05:02:23 +00:00 |
|
Elliott Hughes
|
39392f0481
|
am dc289ce1: (-s ours) am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds."
* commit 'dc289ce17c1f009e3054d0c176b2aefc78887b9e':
|
2015-08-27 05:02:21 +00:00 |
|
Elliott Hughes
|
8d395444b2
|
am 158800c9: (-s ours) am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h."
* commit '158800c9edc2edb2e946c7c45929a1bede34090c':
|
2015-08-27 05:02:20 +00:00 |
|
Elliott Hughes
|
b97a5f276d
|
am b4ec57c0: (-s ours) am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build.""
* commit 'b4ec57c01621c768c8a8d92957dd824735f6a6cc':
|
2015-08-27 05:02:18 +00:00 |
|
Elliott Hughes
|
241eca25ce
|
am 7f45f953: (-s ours) am 0049aecf: am a6065996: Merge "Stop defining WIN32."
* commit '7f45f953add5181a4faeb40c6e25180267ae4d9c':
|
2015-08-27 05:02:16 +00:00 |
|
Ying Wang
|
b234b35101
|
am 4270d91b: (-s ours) am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '4270d91bbe06a3db32a9e52ba2939f26c05961b7':
|
2015-08-27 05:02:15 +00:00 |
|
Elliott Hughes
|
bb89c75397
|
am 59b3bd27: (-s ours) am 896d0ee2: am 999fd4ea: Merge "Also -DWIN32 to keep llvm building."
* commit '59b3bd27a05636afa50d72167fe2ef09c6986f9e':
|
2015-08-27 05:02:13 +00:00 |
|
Elliott Hughes
|
bf14129e4f
|
am 29e8a329: (-s ours) am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build."
* commit '29e8a32972bf2ad0e5fddc4c92f5cc6e5c0763c6':
|
2015-08-27 05:02:11 +00:00 |
|
Elliott Hughes
|
9c3dac5b33
|
am a65473b0: (-s ours) am 896b9c60: am 57069e59: Merge "Remove Windows AndroidConfig.h."
* commit 'a65473b0e7d133c41c41494f0c36bc586fae3261':
|
2015-08-27 05:02:09 +00:00 |
|
Shinichiro Hamaji
|
c3113c54b9
|
am 50479339: (-s ours) am 9e7efdf3: am e7d6f04d: Merge "Add two flags for the latest ckati"
* commit '5047933993fd499aca494bec172734ee9b5de03e':
|
2015-08-27 05:02:07 +00:00 |
|
Dan Albert
|
f7924ec7ec
|
am a8803f0b: (-s ours) am 54e0b7de: am 6b966aff: Merge "Fix sanitizer choice for global vs module."
* commit 'a8803f0b3cec5c9e7d97cc3aaa633a2aaaa3359e':
|
2015-08-27 05:02:02 +00:00 |
|
Elliott Hughes
|
ae23a3bb2d
|
am 33a14397: (-s ours) am 088849e2: am b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME."
* commit '33a14397960dc9cb41bc8cb3c32274cfc4e487c6':
|
2015-08-27 05:01:57 +00:00 |
|
Christopher Wiley
|
2188fccb7b
|
am 5bc62fdc: (-s ours) am 7db39448: am 9e3b4ed4: Merge "Fix DBus proxies to use all definitions"
* commit '5bc62fdc652d80eff823cecdcbcc8144170c9ad3':
|
2015-08-27 05:01:55 +00:00 |
|
Christopher Wiley
|
36b59dff5f
|
am 9c49f0af: (-s ours) am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '9c49f0affa43b946d2618eb2efbddf15588998c8':
|
2015-08-27 05:01:53 +00:00 |
|
Tao Bao
|
d024f6bbcf
|
am 42a2b83c: (-s ours) am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit '42a2b83c535e73bd626696e1f3f96b4f9dfc4dde':
|
2015-08-27 05:01:51 +00:00 |
|
Konstantinos Menychtas
|
4ab626159f
|
am 8694cf75: (-s ours) am 956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '8694cf75b60c96e417163fc6d81e4760a501f089':
|
2015-08-27 05:01:49 +00:00 |
|
Chih-hung Hsieh
|
0c1eb672e1
|
am 2cc00c30: (-s ours) am 3eccd047: am 59c858fc: Merge "Remove special x86 flag that disables tail call optimization."
* commit '2cc00c305caba6ddfd79bdc2cf58673a9dd524b3':
|
2015-08-27 05:01:47 +00:00 |
|
Ying Wang
|
a181d39b49
|
am 64c9868b: (-s ours) am 71327b90: am 42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
* commit '64c9868bea1d791ee2c571259467e289b02c3f05':
|
2015-08-27 05:01:45 +00:00 |
|
Ying Wang
|
f841d2b809
|
am ac9b5af5: (-s ours) am f526c169: (-s ours) am c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit 'ac9b5af50f84ad83bfa057e42db9c821b76211e5':
|
2015-08-27 05:01:43 +00:00 |
|
Tao Bao
|
0b39ee5b79
|
am 20c68b74: (-s ours) am 5d690a37: am ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '20c68b749475bc5d8f5784105036a8cd7cedfce0':
|
2015-08-27 05:01:41 +00:00 |
|
Dan Willemsen
|
0a855fd42c
|
am 1b148467: (-s ours) am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '1b14846717876e8e6372ffc82f0874925fcacbf7':
|
2015-08-27 05:01:39 +00:00 |
|
Dan Willemsen
|
1ae7750e46
|
am 9cf990be: (-s ours) resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp
* commit '9cf990beec6ef42c09c39e49d3e5991e96a9608b':
|
2015-08-27 05:01:34 +00:00 |
|
Ying Wang
|
c2fcd1efb8
|
am f4ff2b11: (-s ours) am 808f0541: am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit 'f4ff2b119c1e5980cf002bfb260915b1366d879a':
|
2015-08-27 05:01:28 +00:00 |
|
Dan Albert
|
e0b8ab28de
|
am c0ad3161: (-s ours) am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit 'c0ad316183427220bdec656d93171ebaf4c6aa9e':
|
2015-08-27 05:01:26 +00:00 |
|
Elliott Hughes
|
3030af783b
|
am 7cbec69f: (-s ours) am a9a433bd: am 648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '7cbec69fbf35063dce388f254f45d5321628aa97':
|
2015-08-27 05:01:24 +00:00 |
|
Dan Albert
|
3affd4bb08
|
am 401faa35: (-s ours) am 8d61be6c: am f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '401faa3513721d27efd044e83d6cca96edd5d9be':
|
2015-08-27 05:01:21 +00:00 |
|
Justin Klaassen
|
3f748670c3
|
am d4e119e9: (-s ours) Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dev-plus-aosp
* commit 'd4e119e92fd765b5b22f8e12d6e6dee1f222d8d0':
Revert "Revert "Switch from Calculator to ExactCalculator""
|
2015-08-27 05:01:19 +00:00 |
|
Tao Bao
|
0fe0200d6a
|
am e3103ce2: (-s ours) am 3b409d56: am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit 'e3103ce2a5cf60e8036fb094e9edc9730ac73f74':
|
2015-08-27 05:01:17 +00:00 |
|
Dirk Dougherty
|
e233146a9c
|
am b92c45fb: (-s ours) am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit 'b92c45fb980bbc63b0616e8a6a97dde346c69306':
|
2015-08-27 05:01:15 +00:00 |
|
Stephen Hines
|
f363f23273
|
am 7b6af490: (-s ours) am 5d17a7e2: am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '7b6af490e9c5a947d28319af00b7cae5beb4e304':
|
2015-08-27 05:01:12 +00:00 |
|
Yang Ni
|
936ea49dc9
|
am 9d1eaaea: (-s ours) am dcfb0c80: am 36600a6b: Merge "Include target api version in build system for rscpp."
* commit '9d1eaaea61ff5942d6261185de1bdaad3a4b57e8':
|
2015-08-27 05:01:11 +00:00 |
|
Dan Albert
|
a49e6472bf
|
am 7911f1b1: (-s ours) am 5e9f4912: am 578acca4: Merge "Link librt on the host when using sanitizers."
* commit '7911f1b1aa2e9301600645979b3dc118257ed50d':
|
2015-08-27 05:01:09 +00:00 |
|