OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
[android-x86/frameworks-base.git] / keystore /
2015-08-26 Deepanshu Guptaam 82fae621: LayoutLib: translucent sys ui bars [DO...
2015-08-26 Deepanshu Guptaam 9068539a: Update nav bar icons. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam e5afc311: Move the layout code out of RenderSessionI...
2015-08-26 Deepanshu Guptaam c989950d: CalendarView rendering: use R.styleable...
2015-08-26 Deepanshu Guptaam b2fdaca9: Add tools:openDrawer to open a DrawerLayou...
2015-08-26 Deepanshu Guptaam a14ec6f4: Change tools:list_item to listitem. [DO...
2015-08-26 Deepanshu Guptaam b1e21330: Implement tools:list_item for RecyclerView...
2015-08-26 Jens Ole Lauridsenam cd4d5b3f: Support AppBar from Material Design. ...
2015-08-26 Deepanshu Guptaam de13095d: Update tests per new layoutlib_api [DO...
2015-08-26 Deepanshu Guptaam db67caa6: Add missing resolveResValue call. [DO...
2015-08-26 Deepanshu Guptaam 6eef1246: LayoutLib: Skip classes from java package...
2015-08-26 Deepanshu Guptaam 4f5e6c63: Skip warnings for some unresolved referenc...
2015-08-26 Deepanshu Guptaam 3e875dbb: Fix import order. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam e5fa12ad: Fix ParserFactory not initialized error...
2015-08-26 Deepanshu Guptaam a287b842: Fix NPE in BridgeContext.obtainStyledAttri...
2015-08-26 Deepanshu Guptaam e698bb27: Fix BridgeTypedArray.getType() [DO NOT...
2015-08-26 Deepanshu Guptaam e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam ba5a02c5: LayoutLib: Support getting resource arrays...
2015-08-26 Deepanshu Guptaam a5ffed0b: LayoutLib: Change nullity annotations...
2015-08-26 Deepanshu Guptaam c96ef952: Add documentation about hack in commit...
2015-08-26 Deepanshu Guptaam b318ff54: Make DatePicker rendering not fail (style...
2015-08-26 Deepanshu Guptaam cc5e69e4: Inject anonymous inner classes of injected...
2015-08-26 Deepanshu Guptaam d7e89906: Update platformDir search in tests. [DO...
2015-08-26 Deepanshu Guptaam afedbc47: Make Context.getClassLoader() work. [DO...
2015-08-26 Deepanshu Guptaam 92480a9a: Fix include tag rendering. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam f6b08547: Show better error message for color attr...
2015-08-26 Deepanshu Guptaam b1370c26: Fix build: udpate parser factory method...
2015-08-26 Deepanshu Guptaam aa729889: Don\'t keep LayoutlibCallback reference...
2015-08-26 Deepanshu Guptaam 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
2015-08-21 Sebastien Hertzam 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18...
2015-08-21 Sebastien Hertzam 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
2015-08-21 Sebastien Hertzam 87a786af: am 445ab7fa: am ff8dc212: Allow debugging...
2015-07-23 Adrian Roosam 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely...
2015-07-21 Diego Perezam 7720eb18: Merge "Render to measured size when using...
2015-07-02 Wale Ogunwaleam bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e...
2015-07-01 Wale Ogunwaleam d72dc762: am ec425a19: am df9948d8: Merge "Prevent...
2015-07-01 Wale Ogunwaleam 131e6b24: Merge "Prevent system uid component from...
2015-07-01 Wale Ogunwaleam f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent...
2015-06-30 Amit Mahajanam 83631047: am 22766e85: am bcf9223b: am 23444e76...
2015-06-30 Joe Fernandezam f1686ac2: am 88c2d704: am 4bd25634: am 765255b4...
2015-06-30 Amit Mahajanam 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO...
2015-06-30 Joe Fernandezam 765255b4: am 6f8dab04: Merge "Fixes a typo where...
2015-06-26 Amit Mahajanam 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE...
2015-06-26 Amit Mahajanam 90224355: DO NOT MERGE Change to add STK_PERMISSION...
2015-06-15 Diego Perezam 5e50e00c: Merge "Fix for shadows on theme editor...
2015-06-15 Diego Perezam ead59b0d: Merge "Fix GcSnapshot drawInLayer when...
2015-06-12 Diego Perezam ce4a9d91: Merge "New custom widgets library" into...
2015-06-12 Diego Perezam f5a99437: Merge "Fix crash when shadowSize is 0...
2015-06-10 Leon Scroggins IIIam e899576f: am 48b38452: am a6932472: am 5b751c80...
2015-06-10 Leon Scroggins IIIam 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT...
2015-06-10 Svetoslavam 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO...
2015-06-03 Justin Harrisonam 127d0b80: Merge "Revert "Revert "During early boot...
2015-06-03 Justin Harrisonam 29b98884: Merge "Revert "During early boot, send...
2015-06-02 Leon Scroggins IIIam 5b751c80: (-s ours) am 7496e153: am 0d208173: DO...
2015-05-27 Leon Scroggins IIIam 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87...
2015-05-27 Leon Scroggins IIIam b6e3f930: am 2bbcc253: am b36ace74: Merge "Check...
2015-05-27 Leon Scroggins IIIam 425d7c87: (-s ours) am 11297581: am 18d79267: Check...
2015-05-27 Wale Ogunwaleam 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM...
2015-05-14 John Reckam 862540cd: Merge "Revert "DO NOT MERGE Backport of...
2015-05-13 John Reckam 69355eaa: Merge "DO NOT MERGE Backport of limited...
2015-05-12 Christopher Tateam afd883f8: During early boot, send LOCALE_CHANGED...
2015-05-08 Christopher Tateam ea2c4033: Mark persistent apps as such when the...
2015-05-07 Diego Perezam 4b125836: Merge "Added function to render a drawable...
2015-05-07 Diego Perezam 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into...
2015-05-07 Diego Perezam 263e6dfa: Merge "Make status and navigation bars...
2015-05-06 Diego Perezam 19dbe50b: Merge "Move StatusBar to use statusBarColo...
2015-05-06 Diego Perezam bc47abe4: Merge "Make sure shaders use a color model...
2015-05-06 Deepanshu Guptaam 1f8e3de4: Merge "More layoutlib tests." into lmp...
2015-05-06 Deepanshu Guptaam b4ca896f: Merge "RecyclerView in LayoutLib: better...
2015-05-06 Diego Perezam 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using...
2015-05-06 Deepanshu Guptaam 4f8a9996: Merge "Nullity annotations to some tests...
2015-05-06 Deepanshu Guptaam 92e79868: Merge "Fix title bar showing when not...
2015-05-06 Deepanshu Guptaam 9aa600e7: Merge "LayoutLib: fix crash when shadow...
2015-05-04 Andrew Solovayam c1174104: am fbd4af0f: Merge "Docs: New swipe-to...
2015-05-02 Rich Slogaram a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions
2015-04-30 Rich Slogaram a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 downl...
2015-04-30 Rich Slogaram f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates
2015-04-30 Rich Slogaram 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downl...
2015-04-30 Rich Slogaram b874dc04: am 07aca646: Merge "docs: plugin 1.2.0...
2015-04-30 Rich Slogaram ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revis...
2015-04-29 David Friedmanam c637af9e: am 75f071df: Merge "Localized Android...
2015-04-24 Scott Roweam 5827af11: am 02e4f2fb: Merge "docs: Supported media...
2015-04-24 Leon Scroggins IIIam 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f...
2015-04-24 Leon Scroggins IIIam 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_crea...
2015-04-23 Andrew Solovayam 44fa5e71: am 5b3152cf: Merge "Docs: Correcting secti...
2015-04-23 Andrew Solovayam 7a866a88: am 09cf4d50: Merge "docs: Update to doc...
2015-04-23 Leon Scroggins IIIam ee35410f: (-s ours) am a7501119: am 69b8e962: Make...
2015-04-23 Svet Ganovam 00e91901: Merge "DO NOT MERGE Don\'t take flags...
2015-04-23 Quddus Chongam d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party...
2015-04-23 Quddus Chongam 7a8b0945: am 789c5971: Merge "docs: Added What\...
2015-04-21 Luan Nguyenam 1cc56633: am 33ac358a: docs: Add Wear Capability...
2015-04-21 Luan Nguyenam 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel...
2015-04-20 Quddus Chongam 220f360e: am 900831f3: docs: Added 3rd-party Javadoc...
2015-04-19 Ryosuke Matsuuchiam 558907f7: am 0d2f2803: Merge "doc: Add Korean versio...
2015-04-18 Dirk Doughertyam 6e141199: am ff233af7: Merge "Doc change: distribute...
2015-04-17 Rich Slogaram 203a4739: am 1fcc6bd8: Merge "docs: studio remove...
2015-04-17 Rich Slogaram 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer...
2015-04-16 Deepanshu Guptaam cd6e00c6: Merge changes from topic \'layoutlib-api...
2015-04-14 Joe Fernandezam 5b6e91a6: am af5f2000: Merge "docs: Add Cross-Refere...
2015-04-14 Dirk Doughertyam a80fc040: am 00f857c5: Merge "Doc change: add new...
next