summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmergeCraig Mautner2014-03-141-12/+16
|\ | | | | | | | | * commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2': Show the keyguard if unsecure window on top
| * am ff89d589: Merge commit \'3b9de0a4\' into manualmergeCraig Mautner2014-03-141-12/+16
| |\ | | | | | | | | | | | | * commit 'ff89d589c7eb32265bf70068ffaef24104a580a5': Show the keyguard if unsecure window on top
| | * Merge commit '3b9de0a4' into manualmergeCraig Mautner2014-03-131-12/+16
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: policy/src/com/android/internal/policy/impl/PhoneWindowManager.java Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
| | | * am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-devCraig Mautner2014-03-131-25/+34
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '00e12e61472d850c00cf1e479fda2b371ead1257': Show the keyguard if unsecure window on top
| | | | * am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-devCraig Mautner2014-03-131-25/+34
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c': Show the keyguard if unsecure window on top
| | | | | * Resolved conflicts for merge of ad63d914 to jb-mr2-devCraig Mautner2014-03-131-25/+34
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
| | | | | | * am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the ↵Craig Mautner2014-03-131-24/+33
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyguard if unsecure window on top * commit '20a4f490957407b9534fc453833de2fe2f276426': Show the keyguard if unsecure window on top
| | | | | | | * am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if ↵Craig Mautner2014-03-131-24/+33
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsecure window on top * commit '817f5586053ae135a59cd0768980ca741e9215b0': Show the keyguard if unsecure window on top
| | | | | | | | * am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window ↵Craig Mautner2014-03-131-24/+33
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on top * commit '3d958f81c54252b452631ea1bb6e7954fc7066c8': Show the keyguard if unsecure window on top
| | | | | | | | | * am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on topCraig Mautner2014-03-131-24/+33
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '468e8e9873d764c090576d70aebf658e3e89bbfe': Show the keyguard if unsecure window on top
| | | | | | | | | | * am 1f52437d: Show the keyguard if unsecure window on topCraig Mautner2014-03-131-24/+33
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f52437de9aa6089a72c7c992f9e7291a6a96115': Show the keyguard if unsecure window on top
| | | | | | | | | | | * Show the keyguard if unsecure window on topCraig Mautner2014-03-121-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When traversing windows save the fact that windows above the topmost fullscreen window do not hide the lockscreen. If there is such a window don't show it. (cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9) Fixes bug 13225149. Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
* | | | | | | | | | | | am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of ↵Yohei Yukawa2014-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputMethodManager method calls * commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471': DO NOT MERGE - Preserve the order of InputMethodManager method calls
| * | | | | | | | | | | am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method ↵Yohei Yukawa2014-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls * commit '51b921d0e33302b3f431dcfa15bd6588408525ea': DO NOT MERGE - Preserve the order of InputMethodManager method calls
| | * | | | | | | | | | DO NOT MERGE - Preserve the order of InputMethodManager method callsYohei Yukawa2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520 This CL allows the Framework class InputMethodManager to behave in a more deterministic way, that is to say, with an I/O barrier. InputMethodManager#setAdditionalInputMethodSubtypes is internally implemented as a RPC to the corresponding counterpart in InputMethodManagerService. The problem here is that this RPC is marked as "oneway". As a consequence, this public API call returns immediately without waiting the additional subtypes are actually added. This behavior is also not documented so far unfortunately. See the following demo code: Final InputMethodManager imm = ...; imm.setAdditionalInputMethodSubtypes(id, subTypes); Final List<InputMethodInfo> ims = imm.getInputMethodList(); Currently, it is not guaranteed that the InputMethodInfo returned from #getInputMethodList reflects the result of the previous call of #setAdditionalInputMethodSubtypes because of its undocumented asynchronous nature. With this CL, InputMethodManager#setAdditionalInputMethodSubtypes behaves as if it has I/O barrier. This change should make it easy for IME developers to use additional subtype mechanism. BUG: 13033954 BUG: 13291370 Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
* | | | | | | | | | | | am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher ↵Craig Mautner2014-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icons" into klp-dev * commit 'a921d8b6b1a3478f258b9999ed909907216edbae': Fix activities appearing behind launcher icons
| * | | | | | | | | | | am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-devCraig Mautner2014-03-141-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3217cc6ff2b3139d8854a3f681da6ae1d163ac92': Fix activities appearing behind launcher icons
| | * | | | | | | | | | Merge "Fix activities appearing behind launcher icons" into klp-devCraig Mautner2014-03-141-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix activities appearing behind launcher iconsCraig Mautner2014-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866 Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
* | | | | | | | | | | | | am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition ↵Mike Lockwood2014-03-141-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between accessory start and USB configured uevents" into klp-dev * commit 'ff64f5ed7c2b55878d149d546092e029cba15465': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
| * | | | | | | | | | | | am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory ↵Mike Lockwood2014-03-131-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start and USB configured uevents" into klp-dev * commit '381374b3cd66f364fd644c21f2d9128bcde2f58a': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
| | * | | | | | | | | | | Merge "UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-131-2/+25
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured uevents" into klp-dev
| | | * | | | | | | | | | | UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured uevents Bug: 13393825 Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
* | | | | | | | | | | | | | am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"Victoria Lease2014-03-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1365d98270e0a0a61d10743820e923aeff974b39': remove unnecessary switchUser call
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4cde7734: Merge "remove unnecessary switchUser call"Victoria Lease2014-03-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4cde773435074809672f9de6a47b26de902a83d1': remove unnecessary switchUser call
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "remove unnecessary switchUser call"Victoria Lease2014-03-141-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | remove unnecessary switchUser callJianzheng Zhou2014-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If userId doesn't change, no need to do switchuser.or it will introduce some tweak for gps modules in quick off/on because they need cost time in off/on. Change-Id: Ie5e408dc8be69c8a63a18bcb2cfe478cef4d70e6 Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
* | | | | | | | | | | | | | | | | am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0232642b74517aa2717673f0811ba65c620f491': Fix layoutlib build.
| * | | | | | | | | | | | | | | | am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '629daddd03b598616de7c30a13b1f9f9b11b98fe': Fix layoutlib build.
| | * | | | | | | | | | | | | | | Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was using private data structures from libcore. Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
* | | | | | | | | | | | | | | | | am 50694917: am 7e566239: Merge "docs: Updated Building your First App ↵Ricardo Cervera2014-03-1410-39/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tutorial. Bug: 13429905" into klp-docs * commit '506949173761f9bde016b9d74de94df4b63df370': docs: Updated Building your First App tutorial. Bug: 13429905
| * | | | | | | | | | | | | | | | am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: ↵Ricardo Cervera2014-03-1310-39/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13429905" into klp-docs * commit '7e566239656c1de32a3bf695cd2ea3a28f1e906b': docs: Updated Building your First App tutorial. Bug: 13429905
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into ↵Ricardo Cervera2014-03-1310-39/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs
| | | * | | | | | | | | | | | | | | | docs: Updated Building your First App tutorial. Bug: 13429905Ricardo Cervera2014-03-1310-39/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Updated default code in activities from ADT -Updated screenshots for ADT wizards when changed -Updated activity_ with fragment_ where required -Other minor changes Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html Patch: Removed border from the new ADT screenshots. Patch: Replaced device screenshots using an Android 4.4 device. Patch: Addressed Katie's comments. Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
* | | | | | | | | | | | | | | | | | | am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home ↵Joe Fernandez2014-03-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page carousel." into klp-docs * commit '8bb11153f946a95485644b08a067472735810ef2': Doc change: Update developer video on home page carousel.
| * | | | | | | | | | | | | | | | | | am f7267c8b: Merge "Doc change: Update developer video on home page ↵Joe Fernandez2014-03-131-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carousel." into klp-docs * commit 'f7267c8bdc5431d486e8bb34722d492be82e44f3': Doc change: Update developer video on home page carousel.
| | * | | | | | | | | | | | | | | | | Merge "Doc change: Update developer video on home page carousel." into klp-docsJoe Fernandez2014-03-131-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Doc change: Update developer video on home page carousel.Dirk Dougherty2014-03-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0cc5f38d8f8b161839585b46dbe3b3b1e1f4942
* | | | | | | | | | | | | | | | | | | | am ad66c27b: am 6d9b034c: Fix typo in public logcat page.John Spurlock2014-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3': Fix typo in public logcat page.
| * | | | | | | | | | | | | | | | | | | am 6d9b034c: Fix typo in public logcat page.John Spurlock2014-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d9b034ce169eeaa7e49574f4694ec96651c7f4e': Fix typo in public logcat page.
| | * | | | | | | | | | | | | | | | | | Fix typo in public logcat page.John Spurlock2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
* | | | | | | | | | | | | | | | | | | | am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android ↵Ricardo Cervera2014-03-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Studio install instructions." into klp-docs * commit '8714a3437e13b4a403e49c4c624f272dd6dc8f4e': docs: Added step to get JDK to the Android Studio install instructions.
| * | | | | | | | | | | | | | | | | | | am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio ↵Ricardo Cervera2014-03-131-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install instructions." into klp-docs * commit 'ef6c94700589958789039749248895a2631ebe55': docs: Added step to get JDK to the Android Studio install instructions.
| | * | | | | | | | | | | | | | | | | | Merge "docs: Added step to get JDK to the Android Studio install ↵Ricardo Cervera2014-03-131-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instructions." into klp-docs
| | | * | | | | | | | | | | | | | | | | docs: Added step to get JDK to the Android Studio install instructions.Ricardo Cervera2014-03-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13353010 Stage: http://quixote.mtv:8002/sdk/installing/studio.html Patch: Addressed Scott's comments. Patch: Addressed Scott's comments. Change-Id: Iabbe0ddbcfab93e1c5fbbcb222c52bb47662850a
* | | | | | | | | | | | | | | | | | | | am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" ↵Katie McCormick2014-03-1414-1/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'b681794d2583e06693c23eec1af4e282b067abd9': Doc update: new doc studio layout editor
| * | | | | | | | | | | | | | | | | | | am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docsKatie McCormick2014-03-1314-1/+151
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07c0ad973a2fdd8a35b3627e69f1134673c8b8e0': Doc update: new doc studio layout editor
| | * | | | | | | | | | | | | | | | | | Merge "Doc update: new doc studio layout editor" into klp-docsKatie McCormick2014-03-1014-1/+151
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Doc update: new doc studio layout editorKatie McCormick2014-03-0514-1/+151
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaeb99dca97086540e7d10f9de9e2978439ddebd9
generated by cgit v1.1 at 2025-02-03 14:52:21 +0000