OSDN Git Service
Zhijun He [Fri, 17 Jan 2014 02:27:09 +0000 (18:27 -0800)]
am
a739445a: Merge "Camera2: update captureIntent and flash mode tag spec"
* commit '
a739445a633a0b06cd18dae2a2f7682985143207':
Camera2: update captureIntent and flash mode tag spec
Zhijun He [Fri, 17 Jan 2014 02:25:47 +0000 (02:25 +0000)]
Merge "Camera2: update captureIntent and flash mode tag spec"
Zhijun He [Fri, 17 Jan 2014 02:18:50 +0000 (18:18 -0800)]
Camera2: update captureIntent and flash mode tag spec
Change-Id: Icf32f8643f7dbe4da98bed2d5a22298af7b58d26
Chris Craik [Fri, 17 Jan 2014 02:10:01 +0000 (18:10 -0800)]
am
8191effc: Merge "Map shadow light position globally"
* commit '
8191effc83b3ec4cfc8647a6eb16ee641fa85a2f':
Map shadow light position globally
Chris Craik [Fri, 17 Jan 2014 02:09:58 +0000 (18:09 -0800)]
am
ed0f7cba: Merge "Fix view z translation with 3d projection disabled"
* commit '
ed0f7cba53be0af991fc7435549f7a798b1d377b':
Fix view z translation with 3d projection disabled
Chris Craik [Fri, 17 Jan 2014 02:09:56 +0000 (18:09 -0800)]
am
ca10d38a: Merge "Transform shadow casters correctly in 3d"
* commit '
ca10d38aef3a6867bdd1b5ab265ea4fd85de50eb':
Transform shadow casters correctly in 3d
Chris Craik [Fri, 17 Jan 2014 02:09:18 +0000 (02:09 +0000)]
Merge "Map shadow light position globally"
Chris Craik [Fri, 17 Jan 2014 02:07:45 +0000 (02:07 +0000)]
Merge "Fix view z translation with 3d projection disabled"
Chris Craik [Fri, 17 Jan 2014 02:07:32 +0000 (02:07 +0000)]
Merge "Transform shadow casters correctly in 3d"
Yohei Yukawa [Fri, 17 Jan 2014 02:00:14 +0000 (18:00 -0800)]
am
c4d0696d: Merge "Make the range checking of BaseInputConnection#setSelection stricter"
* commit '
c4d0696dd37957025bfef2facc4c053847d70be9':
Make the range checking of BaseInputConnection#setSelection stricter
Yohei Yukawa [Fri, 17 Jan 2014 01:57:52 +0000 (01:57 +0000)]
Merge "Make the range checking of BaseInputConnection#setSelection stricter"
Zhijun He [Fri, 17 Jan 2014 01:39:52 +0000 (17:39 -0800)]
am
228f4f92: Camera2: Update 3A state doc
* commit '
228f4f92e70d9326d473e02bcdcc8faf9e706a4d':
Camera2: Update 3A state doc
Zhijun He [Fri, 17 Jan 2014 01:22:05 +0000 (17:22 -0800)]
Camera2: Update 3A state doc
Change-Id: Id484bdff38af34ad2c8b64863d036ff81124401e
Joe Fernandez [Fri, 17 Jan 2014 01:11:50 +0000 (17:11 -0800)]
am
a7eda49a: am
2d7ca0c4: am
6104a749: am
12382d13: am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
a7eda49a82c4bf8d663b76742af0087b2e1be7fb':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Fri, 17 Jan 2014 01:11:47 +0000 (17:11 -0800)]
am
acc96b79: am
0a53d549: am
102e382f: am
75a09a75: am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
acc96b79e7941a61d8ca0ec66ec02a887a3e6b1b':
Fixing bugs in MediaPlayer docs
Marco Nelissen [Fri, 17 Jan 2014 01:11:44 +0000 (17:11 -0800)]
am
77be6f94: Merge "Update doc wrt to android:debuggable and CheckJNI"
* commit '
77be6f94262da49258543fd42c7a3c4235b094a3':
Update doc wrt to android:debuggable and CheckJNI
Eino-Ville Talvala [Fri, 17 Jan 2014 01:11:41 +0000 (17:11 -0800)]
am
77c3c998: Merge "Camera2: Sort metadata @see to make it stable over time"
* commit '
77c3c9983372b52864a7d242c0d79a36502084f1':
Camera2: Sort metadata @see to make it stable over time
Dianne Hackborn [Fri, 17 Jan 2014 01:11:39 +0000 (17:11 -0800)]
am
520e705b: Merge "Whoops, we were counting everything twice in the totals. :("
* commit '
520e705bf860f048836546a524db3b33af06a38a':
Whoops, we were counting everything twice in the totals. :(
Joe Fernandez [Fri, 17 Jan 2014 01:06:39 +0000 (01:06 +0000)]
am
2d7ca0c4: am
6104a749: am
12382d13: am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
2d7ca0c435e9acdff274d2a7817879ec44f61b45':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Fri, 17 Jan 2014 01:06:34 +0000 (01:06 +0000)]
am
0a53d549: am
102e382f: am
75a09a75: am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
0a53d549f38c735cf3cc1eacf401bbf906785b26':
Fixing bugs in MediaPlayer docs
Yohei Yukawa [Thu, 16 Jan 2014 23:59:07 +0000 (08:59 +0900)]
Make the range checking of BaseInputConnection#setSelection stricter
With this change, setSelection will not cause java.lang.IndexOutOfBoundsException
even if a negative index is specified.
Bug:
8841916
Change-Id: Ib62a6ba235f80b7495fefb2e5cc2d5357d804310
Marco Nelissen [Fri, 17 Jan 2014 00:32:24 +0000 (00:32 +0000)]
Merge "Update doc wrt to android:debuggable and CheckJNI"
Eino-Ville Talvala [Fri, 17 Jan 2014 00:29:03 +0000 (00:29 +0000)]
Merge "Camera2: Sort metadata @see to make it stable over time"
Eino-Ville Talvala [Fri, 17 Jan 2014 00:18:52 +0000 (16:18 -0800)]
Camera2: Sort metadata @see to make it stable over time
Bug:
12591820
Change-Id: Idcfd7acd6f9426162ccf0e51fcfdba9f646d4cc0
Dianne Hackborn [Fri, 17 Jan 2014 00:21:21 +0000 (00:21 +0000)]
Merge "Whoops, we were counting everything twice in the totals. :("
Chris Craik [Fri, 17 Jan 2014 00:21:10 +0000 (16:21 -0800)]
Transform shadow casters correctly in 3d
Change-Id: I11067c5aa8c749089b6ee163ddafa91865cc0d9f
Dianne Hackborn [Fri, 17 Jan 2014 00:18:23 +0000 (16:18 -0800)]
Whoops, we were counting everything twice in the totals. :(
Change-Id: Ia8a5adec4db7d692691b2d7e471c446f963a5c21
Alan Viverette [Fri, 17 Jan 2014 00:08:54 +0000 (16:08 -0800)]
am
bdbb065a: Merge "Explicit documentation for View.getTag() return value when not set"
* commit '
bdbb065a1d04d6304ffebef1f914958c9dac6945':
Explicit documentation for View.getTag() return value when not set
Alan Viverette [Fri, 17 Jan 2014 00:06:16 +0000 (00:06 +0000)]
Merge "Explicit documentation for View.getTag() return value when not set"
Alan Viverette [Thu, 16 Jan 2014 23:55:25 +0000 (15:55 -0800)]
Explicit documentation for View.getTag() return value when not set
Change-Id: I143d445b0c801ffabe04f0042e559594e52d07ed
Zhijun He [Thu, 16 Jan 2014 23:50:43 +0000 (15:50 -0800)]
am
5f2a47f3: Camera2: update metadata specs
* commit '
5f2a47f3dedfc7859457067d8cdcdbfc28ee08ac':
Camera2: update metadata specs
Marco Nelissen [Thu, 16 Jan 2014 23:21:44 +0000 (15:21 -0800)]
Update doc wrt to android:debuggable and CheckJNI
Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28
Zhijun He [Thu, 16 Jan 2014 23:44:41 +0000 (15:44 -0800)]
Camera2: update metadata specs
Change-Id: I0f2db931f923af6de281f1404142301d9cfe18ea
Jeff Sharkey [Thu, 16 Jan 2014 23:17:28 +0000 (15:17 -0800)]
am
a17059b7: Merge "Run finalizers before counting for StrictMode."
* commit '
a17059b78795e095c75a3d31ce8553e8713900c8':
Run finalizers before counting for StrictMode.
Jeff Sharkey [Thu, 16 Jan 2014 23:15:17 +0000 (23:15 +0000)]
Merge "Run finalizers before counting for StrictMode."
Selim Cinek [Thu, 16 Jan 2014 23:03:35 +0000 (15:03 -0800)]
am
fed65a6b: Merge "Fixed issue on Keyguard camera icon, where dragging on it did not properly trigger abortion of the camera animation."
* commit '
fed65a6b4a0c601defb0884df50e92c6d40fe42f':
Fixed issue on Keyguard camera icon, where dragging on it did not properly trigger abortion of the camera animation.
Selim Cinek [Thu, 16 Jan 2014 23:00:48 +0000 (23:00 +0000)]
Merge "Fixed issue on Keyguard camera icon, where dragging on it did not properly trigger abortion of the camera animation."
Joe Fernandez [Thu, 16 Jan 2014 22:59:33 +0000 (22:59 +0000)]
am
6104a749: am
12382d13: am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
6104a749b2d02a8961b694619aee59cd0795e976':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Thu, 16 Jan 2014 22:59:27 +0000 (22:59 +0000)]
am
102e382f: am
75a09a75: am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
102e382f26bafe1839c977be6162ccaffc2af578':
Fixing bugs in MediaPlayer docs
Joe Fernandez [Thu, 16 Jan 2014 22:56:15 +0000 (22:56 +0000)]
am
12382d13: am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
12382d13ff70c591ee31ed6b9004298a037b38e9':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Thu, 16 Jan 2014 22:55:52 +0000 (22:55 +0000)]
am
75a09a75: am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
75a09a752aaf276cc3defee2874270cd20bd8a69':
Fixing bugs in MediaPlayer docs
Joe Fernandez [Thu, 16 Jan 2014 22:52:56 +0000 (14:52 -0800)]
am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
fcab250de89352613e3dd8fe6efa180c0a7df4d0':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Thu, 16 Jan 2014 22:52:51 +0000 (14:52 -0800)]
am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
94149cfb3409244fa2d91ee87c0b4d531447110a':
Fixing bugs in MediaPlayer docs
Joe Fernandez [Thu, 16 Jan 2014 22:49:46 +0000 (22:49 +0000)]
am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
16fe3737457ac844da09cd062e23abedbcc1f3e8':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Thu, 16 Jan 2014 22:49:42 +0000 (22:49 +0000)]
am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
acf2b906b34d7c1d16ecb039390f656784c6d034':
Fixing bugs in MediaPlayer docs
Chris Craik [Thu, 16 Jan 2014 22:48:54 +0000 (14:48 -0800)]
Fix view z translation with 3d projection disabled
The ortho projection can't handle 3d translation, so skip that step if
perspective projection isn't enabled.
Change-Id: I231e6bcecc82e876b697e098e034f0fd3b06efde
Joe Fernandez [Thu, 16 Jan 2014 22:46:56 +0000 (22:46 +0000)]
Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:46:17 +0000 (22:46 +0000)]
Merge "Fixing bugs in MediaPlayer docs" into klp-docs
Doug Zongker [Thu, 16 Jan 2014 22:43:00 +0000 (14:43 -0800)]
am
35974112: Merge "boot into recovery via the pre-recovery service"
* commit '
35974112ecd6a296a49f04af0292de2569d039a2':
boot into recovery via the pre-recovery service
Doug Zongker [Thu, 16 Jan 2014 22:41:10 +0000 (22:41 +0000)]
Merge "boot into recovery via the pre-recovery service"
Jeff Brown [Thu, 16 Jan 2014 22:16:58 +0000 (14:16 -0800)]
Jeff Brown [Thu, 16 Jan 2014 22:12:54 +0000 (14:12 -0800)]
Fix build.
Change-Id: I7e0000a5a98e443f27b90884a85bd6106c1f7b9b
Chris Craik [Thu, 16 Jan 2014 22:03:39 +0000 (14:03 -0800)]
Map shadow light position globally
Change-Id: Ic3201cecdf5d2a1dd628e7e40aee912ef516d3b2
Doug Zongker [Tue, 14 Jan 2014 20:29:06 +0000 (12:29 -0800)]
boot into recovery via the pre-recovery service
Change PowerManagerService to start the pre-recovery service rather
than rebooting directly, when requested to reboot into recovery. Add
a new RECOVERY permission which a caller needs (in addition to REBOOT)
in order to go to recovery.
Bug:
12188746
Change-Id: I39121b701c4724558fe751adfbad79f8567faa43
Jeff Sharkey [Thu, 16 Jan 2014 20:46:37 +0000 (12:46 -0800)]
Run finalizers before counting for StrictMode.
Otherwise we sometimes end up counting objects strongly referenced
by the finalizer queue, and falsely detecting an instance leak.
Bug:
12533002
Change-Id: I144c941a3dfb0cbb837b98e80d2f49ffc9ca13c7
Jeff Brown [Thu, 16 Jan 2014 19:47:46 +0000 (11:47 -0800)]
am
09d30981: resolved conflicts for merge of
6f357d32 to master
* commit '
09d30981f8e882ffaa336aa4665bfe348557895a':
Start untangling system server early bootstrapping.
Jeff Brown [Thu, 16 Jan 2014 19:44:20 +0000 (11:44 -0800)]
resolved conflicts for merge of
6f357d32 to master
Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75
Jeff Brown [Thu, 16 Jan 2014 19:35:50 +0000 (11:35 -0800)]
am
d3ee63b6: am
02cc684e: Delete unused power manager functionality.
* commit '
d3ee63b6c6999475288502ccd37eb8840fb8a1c0':
Delete unused power manager functionality.
Jeff Brown [Thu, 16 Jan 2014 19:32:58 +0000 (19:32 +0000)]
am
02cc684e: Delete unused power manager functionality.
* commit '
02cc684e42b13454ba1a013340b41696323a4c2a':
Delete unused power manager functionality.
Jeff Brown [Thu, 16 Jan 2014 04:40:55 +0000 (20:40 -0800)]
Start untangling system server early bootstrapping.
Refactored SystemServer to get rid of a bunch of legacy cruft related
to how the ServerThread used to be started up.
Create system context first when system server starts. This removes
the tangled initialization order dependency that forced us to start
the activity manager service before most anything else.
Moved factory test related constants into the FactoryTest class.
Partially migrated Installer, ActivityManagerService, and
PowerManagerService to the new SystemService pattern. There's more
work to be done here, particularly around the lifecycle of the
power manager.
Bug:
12172368
Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4
Jeff Brown [Thu, 16 Jan 2014 04:41:26 +0000 (20:41 -0800)]
Delete unused power manager functionality.
timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.
Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
Alan Viverette [Thu, 16 Jan 2014 19:15:57 +0000 (11:15 -0800)]
am
3abc47ac: Merge "Update smoothScrollToPosition to move faster for large offsets"
* commit '
3abc47acf8ea2bea2f8a92a100bbceead2178914':
Update smoothScrollToPosition to move faster for large offsets
Alan Viverette [Thu, 16 Jan 2014 19:15:53 +0000 (11:15 -0800)]
am
2b61d540: Merge "Revert changes to default styles and themes"
* commit '
2b61d5406b1b7bf0ff6eb9902b485d6cb97a70a4':
Revert changes to default styles and themes
Alan Viverette [Thu, 16 Jan 2014 19:13:32 +0000 (19:13 +0000)]
Merge "Update smoothScrollToPosition to move faster for large offsets"
Alan Viverette [Thu, 16 Jan 2014 19:13:15 +0000 (19:13 +0000)]
Merge "Revert changes to default styles and themes"
Selim Cinek [Sat, 11 Jan 2014 01:28:15 +0000 (17:28 -0800)]
Fixed issue on Keyguard camera icon, where dragging on it
did not properly trigger abortion of the camera animation.
Also minorly simplified the touch slop calculation
BUG:
12036618
Change-Id: If01b48c815200066b32a37ffc44949edde1376f9
Alan Viverette [Thu, 16 Jan 2014 19:02:55 +0000 (11:02 -0800)]
Revert changes to default styles and themes
Partial revert of commit
65f31d4104a0b667b635abc78406d5159341ad95.
BUG:
12571939
Change-Id: Ideea7b716d5a7b2082a244b9c5ffb02151ee8d67
Victoria Lease [Thu, 16 Jan 2014 17:08:25 +0000 (09:08 -0800)]
am
3d4c3aca: Merge "check for null mEditor in TextView.canCopy()"
* commit '
3d4c3aca868231fe503cd7254f89f1c46a9f8f66':
check for null mEditor in TextView.canCopy()
quddusc [Thu, 16 Jan 2014 17:04:47 +0000 (09:04 -0800)]
am
0574dc53: am
7d86d6b5: am
aa141fb0: am
c2cc2999: am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
0574dc53b20e6bd254725b4209814822c39644d6':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
Victoria Lease [Thu, 16 Jan 2014 16:31:33 +0000 (16:31 +0000)]
Merge "check for null mEditor in TextView.canCopy()"
quddusc [Thu, 16 Jan 2014 16:17:57 +0000 (16:17 +0000)]
am
7d86d6b5: am
aa141fb0: am
c2cc2999: am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
7d86d6b5a7a680b243fb99aadf338a0e55ddbdd8':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
John Spurlock [Thu, 16 Jan 2014 16:16:25 +0000 (08:16 -0800)]
am
ac2c9bf4: Merge "Defend against malformed broadcast in NotificationManager."
* commit '
ac2c9bf4ce0b2e7a75252b9f8359d34a10b9716b':
Defend against malformed broadcast in NotificationManager.
quddusc [Thu, 16 Jan 2014 16:15:14 +0000 (16:15 +0000)]
am
aa141fb0: am
c2cc2999: am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
aa141fb0d9c7938df317954054ba87e16595e4e7':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
John Spurlock [Thu, 16 Jan 2014 16:14:09 +0000 (16:14 +0000)]
Merge "Defend against malformed broadcast in NotificationManager."
quddusc [Thu, 16 Jan 2014 16:11:25 +0000 (16:11 +0000)]
am
c2cc2999: am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
c2cc2999983d221b293d561dd6af8ac0820266c4':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
quddusc [Thu, 16 Jan 2014 16:08:24 +0000 (08:08 -0800)]
am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
7e8a997fdf8acb90d81d57e1563a8d9f858464bd':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
quddusc [Thu, 16 Jan 2014 16:05:54 +0000 (16:05 +0000)]
am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
62729b15a91525cef4dd27226099c245d38e6495':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
Narayan Kamath [Thu, 16 Jan 2014 16:05:28 +0000 (08:05 -0800)]
am
ab864345: Track AArch64 changes from AOSP.
* commit '
ab8643452adcf91781991bce03be26f072311d89':
Track AArch64 changes from AOSP.
quddusc [Thu, 16 Jan 2014 16:03:06 +0000 (16:03 +0000)]
Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
Narayan Kamath [Thu, 16 Jan 2014 11:22:52 +0000 (11:22 +0000)]
Track AArch64 changes from AOSP.
mPtr is now long, not int.
Change-Id: I75297cbef3571f8f0cc02a35a06c1bc1f4fbe416
Narayan Kamath [Thu, 16 Jan 2014 16:00:00 +0000 (08:00 -0800)]
am
103d34d3: am
23b7e0a3: am
d8facb67: am
d569e21d: am
48de490c: am
486544f7: Merge "AArch64: Use long for pointers in view/input classes"
* commit '
103d34d3bb6c7d570b00fda0970b89d807b2c0b8':
AArch64: Use long for pointers in view/input classes
Narayan Kamath [Thu, 16 Jan 2014 15:59:54 +0000 (07:59 -0800)]
am
5875c94c: am
275586aa: am
7471dfc4: am
42defa02: am
faa62aac: am
84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '
5875c94c591e3e10011509cd6a059844316b7f85':
AArch64: Use long for pointers in android/os/MessageQueue
Narayan Kamath [Thu, 16 Jan 2014 15:59:48 +0000 (07:59 -0800)]
am
4d7f9450: am
8492e88a: am
077386db: am
6b81bfd1: am
caea42fd: am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
4d7f9450663468abf5e41e24b7d3b1d5c3ea6143':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:59:45 +0000 (07:59 -0800)]
am
f25afde8: am
419267a1: am
213f243f: am
87a82800: am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
f25afde8dd24e6a23e3a25c05c9ad2965d0ac96e':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:59:42 +0000 (07:59 -0800)]
am
6606d16e: am
6706888e: am
775667c0: am
03e8be75: am
8796ab7f: am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
6606d16e097480e061546306cc95a729f5dccae8':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:59:39 +0000 (07:59 -0800)]
am
a3340da7: am
e18f0e2a: am
19bd2c28: am
ab220dee: am
947d88a0: am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
a3340da7d4ef3872bd1191fcd4bf8b25d1179a25':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:59:36 +0000 (07:59 -0800)]
am
a98bf201: am
e413dae8: am
8e96d73a: am
e488f2c1: am
a0b25d41: am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
a98bf2017ec8d1ef6b60e09b873effb2e370cd25':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:59:33 +0000 (07:59 -0800)]
am
1bf3ab08: am
c45068e4: am
d7a54c65: am
31f10bb2: am
80b3dd0d: am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
1bf3ab08db3dc342461a77e7a261ee9f406a5060':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:59:30 +0000 (07:59 -0800)]
am
d4513aea: am
a5a0d384: am
425b08f1: am
c1abb5e3: am
53321d99: am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
d4513aea25346770427e19587a77f2e06c551ddd':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:59:28 +0000 (07:59 -0800)]
am
b6608575: Merge "Resolved conflicts for merge of
28c6ec02 to master"
* commit '
b66085750ec4e8c4a2abab241ebcbf7edbfe469c':
AArch64: Use long for pointers in media classes
Narayan Kamath [Thu, 16 Jan 2014 15:58:10 +0000 (15:58 +0000)]
am
23b7e0a3: am
d8facb67: am
d569e21d: am
48de490c: am
486544f7: Merge "AArch64: Use long for pointers in view/input classes"
* commit '
23b7e0a32bee5234ef65fccfef1596659a08b630':
AArch64: Use long for pointers in view/input classes
Narayan Kamath [Thu, 16 Jan 2014 15:58:04 +0000 (15:58 +0000)]
am
275586aa: am
7471dfc4: am
42defa02: am
faa62aac: am
84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '
275586aa53889a851e0b739e408896861d76e3a8':
AArch64: Use long for pointers in android/os/MessageQueue
Narayan Kamath [Thu, 16 Jan 2014 15:57:58 +0000 (15:57 +0000)]
am
8492e88a: am
077386db: am
6b81bfd1: am
caea42fd: am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
8492e88a23ee4ac32f05b277654e0f9455fefa9b':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:57:53 +0000 (15:57 +0000)]
am
419267a1: am
213f243f: am
87a82800: am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
419267a164ba586a81a8e669863a494d2a88a44c':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:57:47 +0000 (15:57 +0000)]
am
6706888e: am
775667c0: am
03e8be75: am
8796ab7f: am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
6706888e24aee04c2c914c44e5ef5b1510cf8013':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:57:41 +0000 (15:57 +0000)]
am
e18f0e2a: am
19bd2c28: am
ab220dee: am
947d88a0: am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
e18f0e2a463374502c0236a0d54909d980bf1043':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:57:36 +0000 (15:57 +0000)]
am
e413dae8: am
8e96d73a: am
e488f2c1: am
a0b25d41: am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
e413dae8926f45e08e93dd9454f3b683514f3106':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:57:29 +0000 (15:57 +0000)]
am
c45068e4: am
d7a54c65: am
31f10bb2: am
80b3dd0d: am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
c45068e4a48053447413783e549be7273e38ea97':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:57:23 +0000 (15:57 +0000)]
am
a5a0d384: am
425b08f1: am
c1abb5e3: am
53321d99: am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
a5a0d384fce9e9475c1414f69cb47bf6b5259a4d':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:56:38 +0000 (15:56 +0000)]
Merge "Resolved conflicts for merge of
28c6ec02 to master"
OSDN Git Service
