kmccormick
|
c5c6cc2da1
|
am 8d58f213: am 205d380b: am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '8d58f213d337c20e782738bda021e1076973b68d':
Doc update: add links to maps docs
|
2013-04-03 15:08:25 -07:00 |
|
kmccormick
|
b471da283e
|
am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
Doc update: fix broken code sample
|
2013-04-03 15:03:53 -07:00 |
|
kmccormick
|
8d58f213d3
|
am 205d380b: am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '205d380bdc69ade94dcc05f54dedbf186783cfb3':
Doc update: add links to maps docs
|
2013-04-03 15:02:45 -07:00 |
|
kmccormick
|
205d380bdc
|
am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '9da4bde42329fe6c03d2eb4617f91892002e4460':
Doc update: add links to maps docs
|
2013-04-03 14:59:12 -07:00 |
|
Jean-Michel Trivi
|
314b25d0fd
|
resolved conflicts for merge of ca762bee to master
Change-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1
|
2013-04-03 14:58:48 -07:00 |
|
kmccormick
|
9da4bde423
|
am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f':
Doc update: add links to maps docs
|
2013-04-03 14:54:32 -07:00 |
|
kmccormick
|
4b846e0d81
|
am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit '322ba0d403ca063c1374d48c5a6717a585052abf':
Doc update: add links to maps docs
|
2013-04-03 14:50:32 -07:00 |
|
kmccormick
|
322ba0d403
|
am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit 'a0907a1278c7ce568baabb3a4b1e2e9f83e18a09':
Doc update: add links to maps docs
|
2013-04-03 14:47:14 -07:00 |
|
kmccormick
|
a0907a1278
|
am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
* commit 'edbe6e134846d2a01378497dca42b47be7e7292b':
Doc update: add links to maps docs
|
2013-04-03 14:43:37 -07:00 |
|
kmccormick
|
edbe6e1348
|
Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
|
2013-04-03 21:39:43 +00:00 |
|
kmccormick
|
b85e328d38
|
am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit 'bbcf0852f786ea1c9cf6dca85f45487b7739bfab':
Doc update: fix broken code sample
|
2013-04-03 14:34:07 -07:00 |
|
kmccormick
|
d056e62b19
|
Doc update: add links to maps docs
"Bug: 8090710"
Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4
|
2013-04-03 14:30:31 -07:00 |
|
kmccormick
|
bbcf0852f7
|
am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
Doc update: fix broken code sample
|
2013-04-03 14:30:09 -07:00 |
|
kmccormick
|
9d9365916d
|
am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
Doc update: fix broken code sample
|
2013-04-03 14:26:34 -07:00 |
|
kmccormick
|
f57266175d
|
am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
Doc update: fix broken code sample
|
2013-04-03 14:23:54 -07:00 |
|
kmccormick
|
2144eee357
|
am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
Doc update: fix broken code sample
|
2013-04-03 14:21:10 -07:00 |
|
kmccormick
|
3fb5536d62
|
am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '91e01a4d2ee09a1a6a226302cd6d524a1c96070f':
Doc update: fix broken code sample
|
2013-04-03 14:18:56 -07:00 |
|
kmccormick
|
91e01a4d2e
|
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
|
2013-04-03 21:16:08 +00:00 |
|
Jean-Michel Trivi
|
ca762beea4
|
am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
RemoteControlClient receives playback position change requests
|
2013-04-03 14:14:49 -07:00 |
|
kmccormick
|
e4ce502d77
|
Doc update: fix broken code sample
"Bug: 8537853"
Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
|
2013-04-03 14:13:36 -07:00 |
|
Ying Wang
|
490b579123
|
am d472ad74: Merge branch \'jb-mr2-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr2-dev-plus-aosp
* commit 'd472ad742732e4e81c33f191bcecf8567605ab86':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 14:12:30 -07:00 |
|
Brian Carlstrom
|
96242a1b17
|
am 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
* commit '3c7df09d4dd00fb23da888726182f00788957cd9':
Adjust the HttpResponseCache for OkHttp.
|
2013-04-03 14:12:27 -07:00 |
|
Chris Craik
|
a81c6a703e
|
am 9668dddd: am ff7ae2dc: Merge "Correct save/restore match up" into jb-mr2-dev
* commit '9668dddd6f6ccb24455eb492db3949cb8e0fc694':
Correct save/restore match up
|
2013-04-03 14:12:16 -07:00 |
|
Jean-Michel Trivi
|
6a5702041f
|
Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
|
2013-04-03 21:11:12 +00:00 |
|
Kenny Root
|
648ac562e0
|
Merge "resolved conflicts for merge of 0afa8b36 to master"
|
2013-04-03 21:09:43 +00:00 |
|
Baligh Uddin
|
41cf921a10
|
Merge "Import translations. DO NOT MERGE"
|
2013-04-03 21:08:28 +00:00 |
|
Ying Wang
|
d472ad7427
|
Merge branch 'jb-mr2-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr2-dev-plus-aosp
|
2013-04-03 14:07:02 -07:00 |
|
Brian Carlstrom
|
3c7df09d4d
|
am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
Adjust the HttpResponseCache for OkHttp.
|
2013-04-03 14:06:55 -07:00 |
|
kmccormick
|
f43de869ed
|
am 4d88259f: am fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit '4d88259f625266400cd6116973d1bc152ae83f26':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 14:06:50 -07:00 |
|
Kenny Root
|
de1175db67
|
resolved conflicts for merge of 0afa8b36 to master
Change-Id: I09a453ab5dbad58e3dc0858972e222a34d53b282
|
2013-04-03 14:04:14 -07:00 |
|
kmccormick
|
4d88259f62
|
am fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit 'fa387c518274b91d770fb1b7285d6a123321ef9b':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 14:01:53 -07:00 |
|
Chris Craik
|
0147afa742
|
am 2e24cbf8: am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev
* commit '2e24cbf802e43644188aa0f7c35754eddac9ad23':
Account for hairlines in quick rejection logic
|
2013-04-03 13:55:23 -07:00 |
|
kmccormick
|
fa387c5182
|
am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit '73c8a7a8200aab208abacc42a6fcbce5d3dbc1b0':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 13:54:16 -07:00 |
|
kmccormick
|
73c8a7a820
|
am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit '3789fa0f6becc09055d454808fe617754b5ef1c7':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 13:51:49 -07:00 |
|
Chris Craik
|
9668dddd6f
|
am ff7ae2dc: Merge "Correct save/restore match up" into jb-mr2-dev
* commit 'ff7ae2dccd3b8ba015963126d8a655b417d3fcd3':
Correct save/restore match up
|
2013-04-03 13:50:25 -07:00 |
|
Kenny Root
|
0afa8b3694
|
am 75827d4a: Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
* commit '75827d4a3155c190f455329a67c84ac8fbb9bda0':
Add direct API to get ManifestDigest
|
2013-04-03 13:50:22 -07:00 |
|
Chris Craik
|
2e24cbf802
|
am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev
* commit 'e0b39fc18c10224c4e66f70aa472d8497b1b4621':
Account for hairlines in quick rejection logic
|
2013-04-03 13:50:19 -07:00 |
|
kmccormick
|
3789fa0f6b
|
am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit '8acb7166b3cbf00e6972393bc929ef7cc54c7108':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 13:49:33 -07:00 |
|
Kenny Root
|
38b4e753ec
|
am 7c15eca0: am a7e4795b: Merge "Remove keystore entries when package removed"
* commit '7c15eca06f482d77e190c1575bd335ebe14216c2':
Remove keystore entries when package removed
|
2013-04-03 13:48:13 -07:00 |
|
Andreas Huber
|
9c2be9bcb7
|
am 9a1ff831: am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
* commit '9a1ff831b755c22e26107a8f446ed02fbde5ccb5':
MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
|
2013-04-03 13:48:10 -07:00 |
|
Craig Mautner
|
621519e8ff
|
am 8d1a32a4: Merge commit \'ddc16ef4387ca25c607348f6155771f17a049763\' into bogus
* commit '8d1a32a413530b37dd382fa53fc990d028770e9e':
Fix potential deadlock between LockScreen and WindowManagerService
|
2013-04-03 13:48:08 -07:00 |
|
kmccormick
|
8acb7166b3
|
am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
* commit '8b5e342b0e24b9bb546456209d9d27480fa233e8':
Doc update: clean up ubiquitous typo "the the"
|
2013-04-03 13:47:42 -07:00 |
|
Kenny Root
|
7c15eca06f
|
am a7e4795b: Merge "Remove keystore entries when package removed"
* commit 'a7e4795bb35986164294e6f7ef56e31c9de0c06d':
Remove keystore entries when package removed
|
2013-04-03 13:38:37 -07:00 |
|
Andreas Huber
|
9a1ff831b7
|
am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
|
2013-04-03 13:38:34 -07:00 |
|
Chris Craik
|
ff7ae2dccd
|
Merge "Correct save/restore match up" into jb-mr2-dev
|
2013-04-03 20:31:49 +00:00 |
|
Kenny Root
|
75827d4a31
|
Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
|
2013-04-03 20:27:43 +00:00 |
|
Brian Carlstrom
|
6fdcb168a7
|
Merge "Adjust the HttpResponseCache for OkHttp."
|
2013-04-03 20:17:25 +00:00 |
|
jwilson
|
dea64ad715
|
Adjust the HttpResponseCache for OkHttp.
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
|
2013-04-03 20:15:36 +00:00 |
|
Craig Mautner
|
8d1a32a413
|
Merge commit 'ddc16ef4387ca25c607348f6155771f17a049763' into bogus
|
2013-04-03 13:14:30 -07:00 |
|
kmccormick
|
8b5e342b0e
|
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
|
2013-04-03 20:07:53 +00:00 |
|