OSDN Git Service
Andre Eisenbach [Thu, 25 Sep 2014 17:18:45 +0000 (17:18 +0000)]
am
8ba97cf8: am
05d80488: am
c9e7505a: am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
8ba97cf8845e31103dbf14a7072760f5275b71ab':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 17:18:41 +0000 (17:18 +0000)]
am
6c77445b: am
574e57da: am
31103492: am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
6c77445b5d025f34a744b9ffcf3df26592f9e480':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 17:18:36 +0000 (17:18 +0000)]
am
4d53a61b: am
36dbe967: am
c8d99e5c: am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
4d53a61b6636dcc4be7089daef59a159d567636a':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 17:18:31 +0000 (17:18 +0000)]
am
d46c9385: am
1eb1a4fa: am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
d46c93852393569e3211fc7bada91e712634572e':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 17:18:26 +0000 (17:18 +0000)]
am
e7b9e3c6: am
72e1f678: am
0ecbcd00: am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
e7b9e3c6a36f0f88b345204249c0848cc4cfb2d9':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 17:18:19 +0000 (17:18 +0000)]
am
e25159c4: am
4706b24e: am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
e25159c448db6abc85d95abcc28ac1edea1f78a5':
Fix AVD for CTS failure.
Andre Eisenbach [Thu, 25 Sep 2014 17:05:59 +0000 (17:05 +0000)]
am
05d80488: am
c9e7505a: am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
05d8048883b25f0f65e689880221c7b5af9f7c52':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 17:05:55 +0000 (17:05 +0000)]
am
574e57da: am
31103492: am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
574e57da1851f1375c5526b6b0b35fe56dc16fb6':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 17:05:47 +0000 (17:05 +0000)]
am
36dbe967: am
c8d99e5c: am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
36dbe967a0027842abe9051ddc4a87704785f84c':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 17:05:42 +0000 (17:05 +0000)]
am
1eb1a4fa: am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 17:05:38 +0000 (17:05 +0000)]
am
72e1f678: am
0ecbcd00: am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
72e1f678dfd8adc69f60507495b9275bd098714e':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 17:05:34 +0000 (17:05 +0000)]
am
4706b24e: am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
4706b24e3d15b5b593a48658eab4af60df782a2e':
Fix AVD for CTS failure.
Andre Eisenbach [Thu, 25 Sep 2014 16:52:10 +0000 (16:52 +0000)]
am
c9e7505a: am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
c9e7505a0ab0ff337e09bed6afdeef86512cda5f':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:52:07 +0000 (16:52 +0000)]
am
31103492: am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
311034922d795ec7807ff3f29f399568a6600bf7':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:52:03 +0000 (16:52 +0000)]
am
c8d99e5c: am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
c8d99e5ca8b0c7d3e2e83023a6930fbf8664ce78':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:51:59 +0000 (16:51 +0000)]
am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b47a75f227bd43f90c2f437ea991d5fa42603d04':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:51:54 +0000 (16:51 +0000)]
am
0ecbcd00: am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
0ecbcd0043a6fb065b86de6da6edc8e967420a24':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:51:50 +0000 (16:51 +0000)]
am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
6bdc2e08b712f147e5aeec39afded3d723b8426c':
Fix AVD for CTS failure.
Andre Eisenbach [Thu, 25 Sep 2014 16:38:19 +0000 (16:38 +0000)]
am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
630f9671beae6a09e8a1fa315b632d292a83c4f0':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:38:15 +0000 (16:38 +0000)]
am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
0604f9b7eaf51920c177f5af845bb254c3695074':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:38:12 +0000 (16:38 +0000)]
am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
7c993e8c16de0322ee231979b798cc40cd5b1576':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:38:08 +0000 (16:38 +0000)]
am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b8bbeff0796847bbe98deb2d84989b656356873c':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:38:05 +0000 (16:38 +0000)]
am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
64816d534c0bc42f5e83bd24bb6c452f61e61fdc':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:38:00 +0000 (16:38 +0000)]
am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
7ac0a907051287a9cb01b3b54332a7ba865102e6':
Fix AVD for CTS failure.
Evan Charlton [Thu, 25 Sep 2014 16:29:41 +0000 (16:29 +0000)]
am
22e0e6fc: am
11316e1c: am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
22e0e6fcc74796986afe5a6469ee080d00dfeb04':
Revert "@hide ConnectionService APIs."
Andre Eisenbach [Thu, 25 Sep 2014 16:22:45 +0000 (16:22 +0000)]
am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)]
am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
f9b8c88c6529daebe9676d7c440fcd3e478ec034':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:22:31 +0000 (16:22 +0000)]
am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
aa1f0856a144f2f2ba14c6358d633887e7e8b936':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:22:22 +0000 (16:22 +0000)]
am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:22:10 +0000 (16:22 +0000)]
am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
a00457a60160f27e15c9d75824057f7d914b7b7d':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:22:06 +0000 (16:22 +0000)]
am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
c793e67ca93a1550fa68c887ef00d207ac1e1d84':
Fix AVD for CTS failure.
Evan Charlton [Thu, 25 Sep 2014 16:17:44 +0000 (16:17 +0000)]
am
11316e1c: am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
11316e1c174ca781bea357b558a8d291fe7c18ba':
Revert "@hide ConnectionService APIs."
Evan Charlton [Thu, 25 Sep 2014 16:06:48 +0000 (16:06 +0000)]
am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
8bc6212eeb926b1f00e73af924e1f072f99160b3':
Revert "@hide ConnectionService APIs."
Evan Charlton [Thu, 25 Sep 2014 15:58:34 +0000 (15:58 +0000)]
Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
Ruben Brunk [Thu, 25 Sep 2014 10:35:00 +0000 (10:35 +0000)]
am
043d6fff: am
01105fee: am
ae7ff48d: am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
043d6fffee2b2fe3aa8821914ba761eae964cf2e':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:34:55 +0000 (10:34 +0000)]
am
4f6d22b4: am
4a6095c5: am
3386946d: am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
4f6d22b4d78ec0db19cf9945df704837100d9912':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 10:24:12 +0000 (10:24 +0000)]
am
01105fee: am
ae7ff48d: am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
01105feea74a4d0a063774509efa21ae95d50a3a':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:24:07 +0000 (10:24 +0000)]
am
4a6095c5: am
3386946d: am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
4a6095c5ef87eb6c10b99829efd6a84fe9fc0c70':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 10:14:07 +0000 (10:14 +0000)]
am
ae7ff48d: am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
ae7ff48d3aaf2459d7f146e1a80a55334664dd16':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:14:03 +0000 (10:14 +0000)]
am
3386946d: am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
3386946d60245a5b5777bfb4e79d175e72ff2481':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 10:03:40 +0000 (10:03 +0000)]
am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:03:37 +0000 (10:03 +0000)]
am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
a4f4bd40cad463e6faeebec6694dd78ce7456f20':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 09:51:33 +0000 (09:51 +0000)]
am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
Andre Eisenbach [Wed, 24 Sep 2014 23:57:01 +0000 (23:57 +0000)]
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
Vinit Deshpande [Wed, 24 Sep 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Introduce config setting for scanning mac OUI" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 23:40:55 +0000 (23:40 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Include reason when wiping data." into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:32 +0000 (23:07 +0000)]
Merge "Add one more test and update old tests" into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:17 +0000 (23:07 +0000)]
Merge "Fix AVD for CTS failure." into lmp-dev
RoboErik [Wed, 24 Sep 2014 23:03:26 +0000 (23:03 +0000)]
am
307df51a: am
3f872752: am
e73770ce: am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
307df51add1eca9a2d5f36e9110889cf471a31dc':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 23:03:22 +0000 (23:03 +0000)]
am
cc4d4562: am
bc1ec524: am
57924e40: am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
cc4d4562b88f4467b76b8598c1f4e51a2e3d1266':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 23:03:17 +0000 (23:03 +0000)]
am
bda7fef0: am
e8fd0cf9: am
a5fd257a: am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
bda7fef08d7cab05f1db006edb87386eac89b847':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 23:03:13 +0000 (23:03 +0000)]
am
437a7488: am
c819ec1b: am
e6339fe4: am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
437a7488196e7935bb4547f095e900db156b844e':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 23:03:08 +0000 (23:03 +0000)]
am
18b3aa18: am
68212ccd: am
2ef7a650: am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
18b3aa187f4ccfea6f9c9e6e4d5e5eb3bd2e4296':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 23:03:03 +0000 (23:03 +0000)]
am
17aee50f: am
0804f1f5: am
d32e5cc8: am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
17aee50f9cf1965c36c8140577c3bd9df375c283':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 23:02:58 +0000 (23:02 +0000)]
am
e696393b: am
869939a1: am
946c697a: am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
e696393bea2e29c0d4655071035c655d9793eb7c':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 23:02:53 +0000 (23:02 +0000)]
am
787d0256: am
890ef765: am
025b8203: am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
787d02560eda49ba5f304b9880ebc4758dbe7ba0':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 23:02:48 +0000 (23:02 +0000)]
am
8b1aefc9: am
a37758c8: am
62a7327e: am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
8b1aefc9a4d0fa5f3ba228fd1df8956b14d3c4c9':
Avoid drawing the starting window twice
Selim Cinek [Wed, 24 Sep 2014 23:02:43 +0000 (23:02 +0000)]
am
31b8ed21: am
c23d37aa: am
31dc5801: Only show FAB for the frontmost task
* commit '
31b8ed21c78344587be114669a91095fbd838fa7':
Only show FAB for the frontmost task
Andreas Gampe [Wed, 24 Sep 2014 23:02:38 +0000 (23:02 +0000)]
am
43d02564: resolved conflicts for merge of
dfdabe37 to lmp-mr1-dev-plus-aosp
* commit '
43d0256429c46a1243c8d85a34d029b40fd5e34e':
Frameworks/base: Early init native bridge
RoboErik [Wed, 24 Sep 2014 22:54:38 +0000 (22:54 +0000)]
am
3f872752: am
e73770ce: am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
3f87275212b04b1c7aed91a81a92315b0791a235':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 22:54:33 +0000 (22:54 +0000)]
am
bc1ec524: am
57924e40: am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
bc1ec524ec5b91864547fb06af2132145b296c0a':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 22:54:29 +0000 (22:54 +0000)]
am
e8fd0cf9: am
a5fd257a: am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
e8fd0cf9afa97eba8e9009b77ab1fe6d49aed02d':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 22:54:24 +0000 (22:54 +0000)]
am
c819ec1b: am
e6339fe4: am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
c819ec1beee0d69ee956e77a57523596d17e3eb3':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 22:54:19 +0000 (22:54 +0000)]
am
68212ccd: am
2ef7a650: am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
68212ccd04e322070a2857fa029ce8771caec3c6':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 22:54:15 +0000 (22:54 +0000)]
am
0804f1f5: am
d32e5cc8: am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
0804f1f543686026febf980614b4d98254c86b8f':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 22:54:10 +0000 (22:54 +0000)]
am
869939a1: am
946c697a: am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
869939a186c610de90d247bc27f26260a26c3daa':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 22:54:05 +0000 (22:54 +0000)]
am
890ef765: am
025b8203: am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
890ef76560d34e325b82e1bf72336de8de838844':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 22:54:00 +0000 (22:54 +0000)]
am
a37758c8: am
62a7327e: am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
a37758c8c96b472ee09c67638f518c124be1bf75':
Avoid drawing the starting window twice
Selim Cinek [Wed, 24 Sep 2014 22:53:56 +0000 (22:53 +0000)]
am
c23d37aa: am
31dc5801: Only show FAB for the frontmost task
* commit '
c23d37aae690001d7f5fd82c9db80fd01876e079':
Only show FAB for the frontmost task
Ruben Brunk [Wed, 24 Sep 2014 22:51:54 +0000 (22:51 +0000)]
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
Andreas Gampe [Wed, 24 Sep 2014 22:46:30 +0000 (15:46 -0700)]
resolved conflicts for merge of
dfdabe37 to lmp-mr1-dev-plus-aosp
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
RoboErik [Wed, 24 Sep 2014 22:44:40 +0000 (22:44 +0000)]
am
e73770ce: am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
e73770ce807a9ed235eaaf4de951645407de6bc4':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 22:44:36 +0000 (22:44 +0000)]
am
57924e40: am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
57924e406c3ca224a9e0d2fcba6db213caa1a54b':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 22:44:32 +0000 (22:44 +0000)]
am
a5fd257a: am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
a5fd257acb22a8cdb170327856dd7145afc93b5b':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 22:44:28 +0000 (22:44 +0000)]
am
e6339fe4: am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
e6339fe4a71951dd6bff91a54a289137ff691f1a':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 22:44:24 +0000 (22:44 +0000)]
am
2ef7a650: am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
2ef7a650d6bb2764b2c3c566f99a1ac1b7f19372':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 22:44:20 +0000 (22:44 +0000)]
am
d32e5cc8: am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
d32e5cc8d56d8b8a5638417ae86bd16661304466':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 22:44:15 +0000 (22:44 +0000)]
am
946c697a: am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
946c697abc160fc49446fa68976aff45efcd9005':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 22:44:11 +0000 (22:44 +0000)]
am
025b8203: am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
025b8203ffa22a7f6fc9aa3f054ab5f903735233':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 22:44:06 +0000 (22:44 +0000)]
am
62a7327e: am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
62a7327e74f1915d0fdb9b45b3e4f17e3967e1a4':
Avoid drawing the starting window twice
Selim Cinek [Wed, 24 Sep 2014 22:44:01 +0000 (22:44 +0000)]
am
31dc5801: Only show FAB for the frontmost task
* commit '
31dc5801f9da5acd8a250abc5c12d5e2bcf5da5d':
Only show FAB for the frontmost task
RoboErik [Wed, 24 Sep 2014 22:28:12 +0000 (22:28 +0000)]
am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
0cbc26dbee49058a8f2da8a4659943b3ee928b7d':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 22:28:06 +0000 (22:28 +0000)]
am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
de20862808bcbd379b30d51271b2389f04b1924e':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 22:27:41 +0000 (22:27 +0000)]
am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
98b7584e1c45b9963a59de1625594c704065c575':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 22:27:36 +0000 (22:27 +0000)]
am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
ee0b9782a7ac2844f2942ba44bad4c36f235169c':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 22:27:23 +0000 (22:27 +0000)]
am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
d5a4e17395b62867945f0bd1c7df59fbe9dfba3c':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 22:27:07 +0000 (22:27 +0000)]
am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
737fa54b1a5fc50fdcacdbad95ad2309bd40340c':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 22:27:00 +0000 (22:27 +0000)]
am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
07f751baac5be1184fa8868176fc7e8b4791c3f9':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 22:26:56 +0000 (22:26 +0000)]
am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
443c76479684c6aecf132b415aa7052c6bd9d174':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 22:25:58 +0000 (22:25 +0000)]
am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
326c443e1bed7d0bd711ebfeb7f5c0003d534281':
Avoid drawing the starting window twice
Prerepa Viswanadham [Fri, 19 Sep 2014 17:57:54 +0000 (10:57 -0700)]
Remove remanents of onConnectionCongested in framwork
Bug:
17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
Andreas Gampe [Wed, 24 Sep 2014 22:10:15 +0000 (22:10 +0000)]
am
6f954cf2: Merge "Frameworks/base: Early init native bridge"
* commit '
6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
Frameworks/base: Early init native bridge
Selim Cinek [Mon, 22 Sep 2014 16:35:45 +0000 (18:35 +0200)]
Only show FAB for the frontmost task
Bug:
17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
Joe Fernandez [Wed, 24 Sep 2014 22:04:15 +0000 (22:04 +0000)]
am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
a73fa92c2e0bada989b9196425e179fcc5b8b0de':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Andreas Gampe [Wed, 24 Sep 2014 21:59:50 +0000 (21:59 +0000)]
Merge "Frameworks/base: Early init native bridge"
Joe Fernandez [Wed, 24 Sep 2014 21:54:08 +0000 (21:54 +0000)]
am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
RoboErik [Wed, 24 Sep 2014 21:47:48 +0000 (21:47 +0000)]
am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
2a638f08dc4c750bfd0e358768ddde98c7f23b09':
Clear the volume cache for all inactive state transitions
RoboErik [Wed, 24 Sep 2014 21:35:55 +0000 (21:35 +0000)]
Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
Amith Yamasani [Wed, 24 Sep 2014 21:34:44 +0000 (21:34 +0000)]
am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
Return masked location mode for managed profiles
OSDN Git Service
