summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"Colin Cross2014-02-102-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4': frameworks/base: fix errors inside ALOGV
| | * | | | | | | am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"Colin Cross2014-02-102-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '40545f32d3364604dac0c21a0310c26f7596e3a8': frameworks/base: fix errors inside ALOGV
| | | * | | | | | Merge "frameworks/base: fix errors inside ALOGV"Colin Cross2014-02-102-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | frameworks/base: fix errors inside ALOGVColin Cross2014-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
* | | | | | | | | | Fix NPE on removing a userAmith Yamasani2014-02-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12957232 Check for null mDeviceOwner. Change-Id: I107dc24d1a8de121ebd2c1bb56e1af40bb1c55ac
* | | | | | | | | | Merge "Fix NPE in PolicyControl."John Spurlock2014-02-101-22/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix NPE in PolicyControl.John Spurlock2014-02-101-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:12957738 Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4
* | | | | | | | | | | Merge "Decode file descriptor from the correct offset."Leon Scroggins III2014-02-101-21/+42
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Decode file descriptor from the correct offset.Leon Scroggins III2014-02-061-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few bugs in nativeDecodeFileDescriptor: 1. Restore the FD's offset when exiting the function. 2. Copy the data when potentially using an SkImageRef. The old behavior would have continued to modify the file descriptor's offset each time a new decode was required. The copy ensures that the file descriptor remains unchanged. 3. Buffer the file stream. Prior to this change, if the image was not a PNG, the stream would be rewound to the beginning of the file, even if the file descriptor was passed in with an offset. Thanks to the buffer, the stream is only rewound to the original offset. Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1 in external/skia BUG:12807677 BUG:12895876 Change-Id: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
* | | | | | | | | | | am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve ↵Deepanshu Gupta2014-02-101-40/+45
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text rendering and measurement. * commit 'f7193bf89780039cf924dd7d1bb67f4830517231': Improve text rendering and measurement.
| * | | | | | | | | | am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering ↵Deepanshu Gupta2014-02-101-40/+45
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and measurement. * commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8': Improve text rendering and measurement.
| | * | | | | | | | | am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56b86debcfaf8f661011702d31854bb3804f5fe1': Improve text rendering and measurement.
| | | * \ \ \ \ \ \ \ \ am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c': Improve text rendering and measurement.
| | | | * \ \ \ \ \ \ \ \ am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119': Improve text rendering and measurement.
| | | | | * | | | | | | | | Improve text rendering and measurement.Deepanshu Gupta2014-02-061-40/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix a bug where baseline of the run was modified while rendering resulting in crooked text in some cases. 2. Use GlyphVector.getLogicalBounds() for text measurement which is more accurate than getVisualBounds(). 3. This change also optimizes text rendering by not computing the advances for individual glyphs when not needed. Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
* | | | | | | | | | | | | | Merge "Removing SkiaColorFilter and inspecting the native object directly."Derek Sollenberger2014-02-1027-793/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removing SkiaColorFilter and inspecting the native object directly.Derek Sollenberger2014-02-0727-793/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 10650594 Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
* | | | | | | | | | | | | | | Merge "Add shadow casting / global perspective APIs, hidden for now."Chris Craik2014-02-106-10/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add shadow casting / global perspective APIs, hidden for now.Chris Craik2014-02-076-10/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global perspective isn't yet hooked up in rendering. Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
* | | | | | | | | | | | | | | | am edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into ↵Griff Hazen2014-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72': Fix ActivityView layout bug.
| * | | | | | | | | | | | | | | am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-devGriff Hazen2014-02-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed': Fix ActivityView layout bug.
| | * | | | | | | | | | | | | | Merge "Fix ActivityView layout bug." into klp-modular-devGriff Hazen2014-02-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix ActivityView layout bug.Griff Hazen2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Child TextureView should be positioned at origin of ActivityView, with matching width and height. Previously, a container's padding would be applied twice for example. Change-Id: Ie0be10614a45aede4207abf986721385d04d8c76
* | | | | | | | | | | | | | | | | am a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge ↵Ricardo Cervera2014-02-101-20/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs * commit 'a11ac26b0e012eb9b9829afc74095a5cc6292452': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| * | | | | | | | | | | | | | | | am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ↵Ricardo Cervera2014-02-101-20/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ViewPager animation tutorial. Bug: 12815243" into klp-docs * commit '9d6e456d777a147444da650e10ca9dfc1a64b9cd': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| | * | | | | | | | | | | | | | | am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager ↵Ricardo Cervera2014-02-101-20/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animation tutorial. Bug: 12815243" into klp-docs * commit '332aefe931fe38291fa07fe20c9018eed1c8c0d5': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| | | * | | | | | | | | | | | | am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. ↵Ricardo Cervera2014-02-101-20/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12815243" into klp-docs * commit 'd038afd39874238357a5ca9621921542f57db7a1': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| | | | * | | | | | | | | | | | am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" ↵Ricardo Cervera2014-02-101-20/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit '7074f32440a8d6db4512c82e12b9e1c6891a4ce1': docs: Fixed ViewPager animation tutorial. Bug: 12815243
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docsRicardo Cervera2014-02-101-20/+27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | docs: Fixed ViewPager animation tutorial. Bug: 12815243Ricardo Cervera2014-02-071-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Went through the tutorial and fixed a few minor issues. There is confusion with Fragment and FragmentManager from the support library vs. the main Android APIs. Clarified this by showing some imports explicitly. Tested the new code from the page on Eclipse and it works as expected. Change-Id: I8494a72f4c760a03a6b8f3322c5754e315f22e7c Review: http://quixote.mtv.corp.google.com:8002/training/animation/screen-slide.html
* | | | | | | | | | | | | | | | | | Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-1013-288/+664
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-1013-288/+664
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 3 letter language codes, script codes & variants. The bulk of the changes are related to the implementation of command line filtering of locales etc. The previous code assumed that the value of each "axis" (locale, density, size etc.) could be represented by a 4 byte type. This is no longer the case. This change introduces a new class, AaptLocaleValue which holds a (normalized) locale parsed from a directory name or a filter string. This class takes responsibility for parsing locales as well as writing them to ResTable_config structures, which is their representation in the resource table. This includes minor changes at the java / JNI level for AssetManager. We now call locale.toLanguageTag() to give the native layer a well formed BCP-47 tag. I've removed some duplicated parsing code in AssetManager.cpp and replaced them with functions on ResTable_config. The native getLocales function has been changed to return well formed BCP-47 locales as well, so that the corresponding java function can use Locale.forLanguageTag to construct a Locale object out of it. Finally, this change introduces default and copy constructors for ResTable_config to prevent having to memset() the associated memory to 0 on every stack allocation. Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
* | | | | | | | | | | | | | | | | | | Merge "AssetManager support for 3 letter lang/country codes."Narayan Kamath2014-02-104-49/+431
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-104-49/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 3 letter codes are packed into the existing 32 bit locale field in ResTable_config - We introduce new fields for script / variant information. Note that we define a "match" between two ResTable_config structures to be purely on the basis of their language & country (disregarding the script and the variant). However, configs with scripts and variants are considered to be more specific than those without. Change-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9
* | | | | | | | | | | | | | | | | | am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-02-108-87/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in RS Java/JNI code" * commit '33a608a0a326d9671bffd6750cb5521d6687cc57': AArch64: Use long for pointers in RS Java/JNI code
| * | | | | | | | | | | | | | | | am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS ↵Narayan Kamath2014-02-108-87/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java/JNI code" * commit '578d4f5f50b3b8969125376d696e893dc355faa6': AArch64: Use long for pointers in RS Java/JNI code
| | * | | | | | | | | | | | | | | am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-108-87/+96
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56062983f1e07295c812fba0e22ce579a35b6f76': AArch64: Use long for pointers in RS Java/JNI code
| | | * | | | | | | | | | | | | | Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-108-87/+96
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat2014-02-058-87/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include [x] Some JNI functions, with return type jlong, casts pointer to jint before returning it. This has been fixed. [x] Minor JNI function prototype changes where formal paramter type has been changed to a JNI type (int to jint for example). [x] long is used for ScriptC, Sampler, Font, ProgramStore handles as they can be 64-bit. [x] A new hidden constructor ScriptC(long, RenderScript) has been added. This should eventually replace public API method ScriptC(int, RenderScript). [x] Font and FileA3D use getNativeAsset instead of getAssetInt to get Asset Handles. The getAssetInt method will be deprecated in favor of getNativeAsset, as the former does not support 64-bit. [x] rsnPathCreate method accepts loop as an int. This should be long as the underlying RS function assumes this to be a pointer. Change-Id: I919d857e5933febe63966049da83de9f9adee6f5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | | | | | | | am ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc ↵Katie McCormick2014-02-103-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update: misc GCM fixes" into klp-docs * commit 'ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3': Doc update: misc GCM fixes
| * | | | | | | | | | | | | | | | am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc ↵Katie McCormick2014-02-083-11/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCM fixes" into klp-docs * commit '6366dcbd494afe20912a932bb18faf199e4a1c62': Doc update: misc GCM fixes
| | * | | | | | | | | | | | | | | am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" ↵Katie McCormick2014-02-083-11/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba': Doc update: misc GCM fixes
| | | * | | | | | | | | | | | | | am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docsKatie McCormick2014-02-083-11/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44085b68add3d7583f7832c51409de83655fc4f1': Doc update: misc GCM fixes
| | | | * | | | | | | | | | | | | am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docsKatie McCormick2014-02-083-11/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2fcbff8382b93bd779af546a7dda8f85eba3763': Doc update: misc GCM fixes
| | | | | * | | | | | | | | | | | Merge "Doc update: misc GCM fixes" into klp-docsKatie McCormick2014-02-083-11/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Doc update: misc GCM fixesKatie McCormick2014-02-073-11/+5
| | | | | | | |_|_|/ / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for: b/12909231 b/12887320 b/12872407 Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
* | | | | | | | | | | | | | | | | am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc ↵Dirk Dougherty2014-02-103-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change: add carousel and spotlight for developer video." into klp-docs * commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66': Doc change: add carousel and spotlight for developer video.
| * | | | | | | | | | | | | | | | am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add ↵Dirk Dougherty2014-02-083-0/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carousel and spotlight for developer video." into klp-docs * commit '3333166738ca1382307bcf61e30adba6bdec83d4': Doc change: add carousel and spotlight for developer video.
| | * | | | | | | | | | | | | | | am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and ↵Dirk Dougherty2014-02-083-0/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spotlight for developer video." into klp-docs * commit '3f43b646294857ea2dbd5e2fba944ee0d4c19657': Doc change: add carousel and spotlight for developer video.
| | | * | | | | | | | | | | | | | am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for ↵Dirk Dougherty2014-02-083-0/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | developer video." into klp-docs * commit '7fd4d29e847984c02561c7f385bfe0947432012e': Doc change: add carousel and spotlight for developer video.
generated by cgit v1.1 at 2025-01-26 19:30:06 +0000