163224 Commits

Author SHA1 Message Date
Svet Ganov
216d08ffd5 am 0ee1d87c: am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit '0ee1d87c38344979a273e1a2c7f68f8d075f3ccc':
  Send accessibility events with no window.
2014-10-16 19:51:44 +00:00
Svet Ganov
0ee1d87c38 am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit '515f14d4659626ebf8381a5cc2d6a44063d30b42':
  Send accessibility events with no window.
2014-10-16 19:47:27 +00:00
Svet Ganov
515f14d465 am b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.
2014-10-16 19:40:15 +00:00
Svet Ganov
b22552c35b Merge "Send accessibility events with no window." into lmp-dev 2014-10-16 19:35:41 +00:00
Greg Hackmann
9b1ffd36a1 am 7b47fb76: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '7b47fb7679c781c3f6986c92bdae76185c94b434':
2014-10-16 19:17:18 +00:00
Chenjie Luo
0db099ca30 am 591485df: am e43110ac: am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '591485df659a3c804945da265dcee63fd8b64d8a':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
2014-10-16 19:17:12 +00:00
Scott Rowe
6b7bca2cbb am d534cf04: am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit 'd534cf04f014096e23fa533614a25eafeaafb771':
  docs: update reference to FragmentRetainInstance
2014-10-16 19:17:06 +00:00
Joe Fernandez
b3b530165b am 3ecfba13: am ebdafcbd: am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '3ecfba13c015c3dd2c76bde99c4e639cfb7d3584':
  Typo fixed in sample code
2014-10-16 19:17:00 +00:00
David Friedman
749adf66d0 am 97e21e85: am f8e428dd: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit '97e21e85bd99542ebe7b9083958db516286b9b82':
2014-10-16 19:16:55 +00:00
David Friedman
bc6c216540 am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
  OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:16:25 +00:00
Rich Slogar
9d2a9772e9 am 436d4df6: am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev automerge: 6b1edcd
* commit '436d4df6433e444fa08ec8258f48187e67018dda':
  docs:Build and Platform Tools Updates for Android 5
2014-10-16 19:16:20 +00:00
Andrew Solovay
917a861766 am 3b278f61: am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev automerge: 11014fe
* commit '3b278f61fb8f52e7601759081f293c7c9b7e1266':
  Moved TV Input Framework (TIF) page out of preview.
2014-10-16 19:16:15 +00:00
Greg Hackmann
7b47fb7679 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2014-10-16 19:12:00 +00:00
Chenjie Luo
591485df65 am e43110ac: am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit 'e43110ac8444fff3ac63b30f51e2b785c12b0829':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
2014-10-16 19:11:14 +00:00
Scott Rowe
d534cf04f0 am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '0e3282223921623be7c1c5a158ab30785e1bd565':
  docs: update reference to FragmentRetainInstance
2014-10-16 19:11:09 +00:00
Joe Fernandez
3ecfba13c0 am ebdafcbd: am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit 'ebdafcbd1614b250edd5f5840b4e8e007f016bbf':
  Typo fixed in sample code
2014-10-16 19:11:04 +00:00
David Friedman
97e21e85bd am f8e428dd: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit 'f8e428dd68279a662b310905798479f5fea85c0f':
  OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:10:59 +00:00
David Friedman
57c63dbf27 am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
automerge: f8e428d

* commit 'f8e428dd68279a662b310905798479f5fea85c0f':
  OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:10:44 +00:00
Rich Slogar
436d4df643 am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
automerge: 6b1edcd

* commit '6b1edcd0c852a6365ad3ddc802b8e94b2da99606':
  docs:Build and Platform Tools Updates for Android 5
2014-10-16 19:09:38 +00:00
Andrew Solovay
3b278f61fb am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
automerge: 11014fe

* commit '11014feaed47ef28c0f7782463f99d181261774a':
  Moved TV Input Framework (TIF) page out of preview.
2014-10-16 19:08:37 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
2014-10-16 12:07:35 -07:00
Chenjie Luo
e43110ac84 am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '8fac66821cc12104999bb87c900abff659160a44':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
2014-10-16 19:01:30 +00:00
Scott Rowe
0e32822239 am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit 'c9f6bb8e3675461268e9543369ff39d8dd465da5':
  docs: update reference to FragmentRetainInstance
2014-10-16 19:01:26 +00:00
Joe Fernandez
ebdafcbd16 am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '518a54aed60878329e5e5492f10820108a056d6a':
  Typo fixed in sample code
2014-10-16 19:01:22 +00:00
David Friedman
f8e428dd68 am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit 'b0683f0c3f5eedb332a66203e4850f60eb83dcc5':
  OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:00:16 +00:00
Rich Slogar
6b1edcd0c8 am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
* commit '349e3640b784c277f983ec9c849db3131d135ccf':
  docs:Build and Platform Tools Updates for Android 5
2014-10-16 19:00:03 +00:00
Andrew Solovay
11014feaed am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
  Moved TV Input Framework (TIF) page out of preview.
2014-10-16 18:59:59 +00:00
Scott Rowe
8a1faa9c3d am f1b9b1f9: am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages
* commit 'f1b9b1f9927b8ea009a449045020fdac48cf3610':
  docs: delete preview pages
2014-10-16 18:45:33 +00:00
Prerepa Viswanadham
1724f21160 am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '2e8beaed54aa897eb4b9435ab11d269f15266f4a':
  Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:45:28 +00:00
Lorenzo Colitti
0afed57e60 am dc14068a: am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit 'dc14068a7df03b996de2054cf0579d506331caaa':
  Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:45:23 +00:00
Lorenzo Colitti
5b72efd078 am b7ba3e21: am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit 'b7ba3e21e2a92ce8778045b6fe8b1cddc477215a':
  Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:45:18 +00:00
Lorenzo Colitti
80f8c02eb2 am 03c0c785: am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '03c0c78575c59bb33ca4b5eb1eb20ddf886efa11':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:45:13 +00:00
Chenjie Luo
8fac66821c Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 2014-10-16 18:45:08 +00:00
Christopher Tate
c49b6b4b20 am d1ec1c47: am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit 'd1ec1c47154b96cd123219615480809ce0072b69':
  Fix spurious restore session timeouts
2014-10-16 18:45:08 +00:00
Scott Rowe
c9f6bb8e36 am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
  docs: update reference to FragmentRetainInstance
2014-10-16 18:42:20 +00:00
Joe Fernandez
518a54aed6 am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
  Typo fixed in sample code
2014-10-16 18:42:16 +00:00
Scott Rowe
f1b9b1f992 am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages
* commit 'f83c56cd425099e35dab81f01d1892abffc7f72f':
  docs: delete preview pages
2014-10-16 18:39:55 +00:00
Prerepa Viswanadham
2e8beaed54 am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '06819409c673b6f93c1df9f7d6949f623ff67192':
  Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:39:51 +00:00
Lorenzo Colitti
dc14068a7d am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit 'e526668eae7ba79e9558cb2b34486bbae2403fd5':
  Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:39:46 +00:00
Lorenzo Colitti
b7ba3e21e2 am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '94dbc64c9871d394fc7038c95cc140c52ad35255':
  Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:39:41 +00:00
Lorenzo Colitti
03c0c78575 am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '5fa2929f161164c8040a1b1ab35b04d43de6374c':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:39:37 +00:00
Christopher Tate
d1ec1c4715 am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '31e4eeb26f2c843d141f969271cff8e825909788':
  Fix spurious restore session timeouts
2014-10-16 18:39:32 +00:00
Chenjie Luo
c597c55ffe Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
Bug: 17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d
2014-10-16 11:36:31 -07:00
Scott Rowe
f83c56cd42 am a3bc95c5: am 8f93624e: docs: delete preview pages
* commit 'a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
  docs: delete preview pages
2014-10-16 18:35:40 +00:00
Prerepa Viswanadham
06819409c6 am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
  Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:35:33 +00:00
Lorenzo Colitti
e526668eae am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit 'd04d6c91a311af7a52f05fac5935c9327a990046':
  Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:35:21 +00:00
Lorenzo Colitti
94dbc64c98 am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit 'ffd7335088d228ac0c56fdc7e2faba79c78572bf':
  Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:35:18 +00:00
Lorenzo Colitti
5fa2929f16 am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:35:14 +00:00
Christopher Tate
31e4eeb26f am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts
2014-10-16 18:34:56 +00:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
2014-10-16 18:23:42 +00:00