drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,754 Commits 1 Branch 0 Tags
Commit Graph

179754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
43680f0bbe am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d automerge: 3279949 
automerge: 8d34b1e

* commit '8d34b1e805c5b5fd05c78899f6ff3eb08d19ab1a':
 2015-01-10 11:27:35 +00:00
Deepanshu Gupta
0b104dd5b1 am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 automerge: 8e65d92 
automerge: 9cc4357

* commit '9cc4357ace6a88431654ba038cf0f9bfe3ec650f':
 2015-01-10 11:26:22 +00:00
Deepanshu Gupta
8d34b1e805 am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
automerge: 3279949

* commit '327994977fa865421c522cf089a2692b2c837ed5':
 2015-01-10 10:27:54 +00:00
Deepanshu Gupta
9cc4357ace am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
automerge: 8e65d92

* commit '8e65d92e368e1f9ec21926e1ece2d929237da150':
 2015-01-10 10:26:41 +00:00
Deepanshu Gupta
327994977f am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit 'f58aa342832e69896c21d13d66e6975672af08ff':
 2015-01-10 10:25:10 +00:00
Deepanshu Gupta
8e65d92e36 am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit 'de8b66ffefc2f59accd66787133a5eea3cbd61f2':
 2015-01-10 10:25:05 +00:00
Deepanshu Gupta
f58aa34283 am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '686160b854e845b79f74a526b397bb6dc438392b':
 2015-01-10 10:19:24 +00:00
Deepanshu Gupta
de8b66ffef am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':
 2015-01-10 10:19:20 +00:00
Deepanshu Gupta
686160b854 am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':
 2015-01-10 10:13:00 +00:00
Deepanshu Gupta
7aafa4fd31 am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '38884a30dfe0fffce0c6097fd9d406e45d04aea5':
 2015-01-10 10:12:56 +00:00
Deepanshu Gupta
74e00d229b Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 
automerge: 7da2b5d

* commit '7da2b5dbc259ef026bb075905f9fda3695dd4615':
 2015-01-10 09:48:39 +00:00
Deepanshu Gupta
38884a30df LayoutLib: Fix System.arraycopy() automerge: 51fb775 
automerge: 55c7bd4

* commit '55c7bd4dac3078ab220823e522c9257246933c46':
 2015-01-10 09:47:08 +00:00
Deepanshu Gupta
7da2b5dbc2 Support Locale.toLanguageTag on Java 6 
automerge: dbd64f7

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:57:42 +00:00
Deepanshu Gupta
55c7bd4dac LayoutLib: Fix System.arraycopy() 
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:56:36 +00:00
Deepanshu Gupta
c8807ebbd2 am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: 8e2dd14 
automerge: 2223018

* commit '22230189be8e811881ba24de1cde97f9882a7d45':
  Special case AppCompat to show action bar.
 2015-01-10 04:24:44 +00:00
Deepanshu Gupta
dbf1c7be1b am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 automerge: 2bc2a40 
automerge: 58ade15

* commit '58ade15bcc33fc8d5ade4a26b404c453eedf0cf1':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:23:14 +00:00
Deepanshu Gupta
68fcc01aa8 am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() automerge: 789a992 
automerge: f922a32

* commit 'f922a329aab080938d2c0872dc79bbb5fe08ef44':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:21:56 +00:00
Deepanshu Gupta
22230189be am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
automerge: 8e2dd14

* commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c':
  Special case AppCompat to show action bar.
 2015-01-10 04:14:54 +00:00
Deepanshu Gupta
58ade15bcc am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
automerge: 2bc2a40

* commit '2bc2a4064ae60c1448eaae112cf6f3df4d8f2daa':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:13:34 +00:00
Deepanshu Gupta
8e2dd14e7d am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'f2e04ac7ea1cc2f91ca1562a14c7e0c261f869fe':
  Special case AppCompat to show action bar.
 2015-01-10 04:10:07 +00:00
Deepanshu Gupta
2bc2a4064a am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'cd2e4da9a77396554b274cd79f64b37cadfac282':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:10:02 +00:00
Deepanshu Gupta
f922a329aa am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
automerge: 789a992

* commit '789a9926ad72b1e9349148db17f0b8631e37c74b':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:07:07 +00:00
Deepanshu Gupta
789a9926ad am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'b752d9724871e1ede0d16a7af8f22b2d67bbe5d8':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:05:33 +00:00
Deepanshu Gupta
f2e04ac7ea am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.
 2015-01-10 04:04:22 +00:00
Deepanshu Gupta
cd2e4da9a7 am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit '20625cce4c13d2337456aaa74ba91b6c4379321f':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:04:18 +00:00
Deepanshu Gupta
b752d97248 am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'b3d418ad027c324c1169e7087689a81bfefdf7f3':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:59:58 +00:00
Deepanshu Gupta
c598047d67 am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.
 2015-01-10 03:56:47 +00:00
Deepanshu Gupta
20625cce4c am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:56:44 +00:00
Deepanshu Gupta
b3d418ad02 am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'db703ab64643ef91bbdb989a04597ecf7d0ca928':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:52:05 +00:00
Deepanshu Gupta
ca67a24929 am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
 2015-01-10 03:51:05 +00:00
Deepanshu Gupta
c5871ea1b8 am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:51:01 +00:00
Deepanshu Gupta
db703ab646 am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:43:48 +00:00
Lajos Molnar
530a2b70fa am e332f2a7: am d289a78c: am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit 'e332f2a7fa4b3c5dde3dc4fdf1062ed22d8bb6c4':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 02:22:55 +00:00
Lajos Molnar
a1ec0bcec5 am 48948e10: am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit '48948e10b33b578a6ac405a15740f72574b54a2b':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 02:22:51 +00:00
Deepanshu Gupta
bb600de6e7 am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.
 2015-01-10 02:16:44 +00:00
Paul Jensen
7c9512cb2d am 2a41b761: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e 
* commit '2a41b761866f12f67fdf50efb76dd72e403ff1c2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:15:17 +00:00
Lajos Molnar
e332f2a7fa am d289a78c: am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit 'd289a78c4745e219af493f59c5f174503685278d':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 02:14:35 +00:00
Lajos Molnar
48948e10b3 am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit 'f3694fc139525ae45955087a0e4f15a15ed6e202':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 02:14:29 +00:00
Deepanshu Gupta
7414752735 am 8505c387: Special case AppCompat to show action bar. 
* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
  Special case AppCompat to show action bar.
 2015-01-10 02:10:55 +00:00
Paul Jensen
2a41b76186 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
automerge: 63e2b8e

* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:08:59 +00:00
Paul Jensen
63e2b8e058 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:06:06 +00:00
Paul Jensen
60944390cd Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2015-01-10 01:59:45 +00:00
Deepanshu Gupta
dbd64f7c90 Support Locale.toLanguageTag on Java 6 
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
 2015-01-09 17:43:12 -08:00
Rachad
9eed8f9a5e am 2a7991ee: am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev automerge: b60bb35 
* commit '2a7991ee2f331c242ff9f7b87058e64b50a616fd':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:37:29 +00:00
Rachad
2a7991ee2f am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 
automerge: b60bb35

* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:31:01 +00:00
Rachad
b60bb35650 am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 
* commit '6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:27:31 +00:00
Lajos Molnar
d289a78c47 am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit '7f94b52fc7c66bc40702b46f59b3929c076cbbfb':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 01:26:02 +00:00
Lajos Molnar
f3694fc139 am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit '98840f2bd2fb96225ed5c95644937d55d4189ca6':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 01:25:55 +00:00
Ruben Brunk
1bc109b928 am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. 
* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
 2015-01-10 01:24:55 +00:00
Rachad
6d3cff1264 Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 2015-01-10 01:23:35 +00:00