summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18590044 Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c
* | | | | | | | am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for ↵Deepanshu Gupta2014-11-211-10/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | styles with dots." into lmp-dev automerge: ddc83df * commit '58238d900b43f6b780890b7ea93c11a877936ed7': Fix setTextAppearance for styles with dots.
| * | | | | | | am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-211-10/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ddc83df * commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a': Fix setTextAppearance for styles with dots.
| | * | | | | | am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4104abf875e16ad54c248ce602e573d2144732dd': Fix setTextAppearance for styles with dots.
| | | * | | | | Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix setTextAppearance for styles with dots.Deepanshu Gupta2014-11-181-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/78842 Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
| | * | | | | | | am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-devDeepanshu Gupta2014-11-192-0/+45
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a': LayoutLib: Stub AM/PM keycodes in Time Picker.
| | | * | | | | | LayoutLib: Stub AM/PM keycodes in Time Picker.Deepanshu Gupta2014-11-182-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimePickerSpinnerDelegate doesn't need to deal with input when running inside LayoutLib. So, we just return the keycodes as if it's running in English locale. Bug: http://b.android.com/79189 Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
* | | | | | | | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media ↵Dianne Hackborn2014-11-212-1/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process." into lmp-mr1-dev * commit '42fec57f3addfb1958f814b5d6772ff81341ba20': Fix issue with call backs from media process.
| * | | | | | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-192-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All but a few lines of this is for issue #16013164, which allowed apps to do some operations as the media uid by having it call back to them to open a file. The problem here is with the tempory identity stuff in the activity manager, allowing us to make the open call as the original caller... ideally we should figure out a way to just get rid of all of that, but the solution here is actually easier (even though it doesn't look it) -- we now hand a token over to the openFile() call that it can use when doing permission checks to say "yes I would like the check to be against whoever is responsible for the open". This allows us to do the uid remapping for only this one specific set of permission checks, and nothing else. Also fix issue #17487348: Isolated services can access system services they shouldn't be able to. Don't send any system service IBinder objects down for the first initialization of an isolated process. Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
* | | | | | | | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '537888be7d5cfa6bfa9ddd459a622ea208339735': kill HAVE_LOCALTIME_R
| * | | | | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18361583 Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b
* | | | | | | | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
| * | | | | | | | Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
* | | | | | | | | am 32f7a6d8: Merge "Move device admin max screen off timeout to internal ↵Jeff Brown2014-11-121-5/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface." into lmp-mr1-dev automerge: c1275e7 * commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08': Move device admin max screen off timeout to internal interface.
| * | | | | | | | Merge "Move device admin max screen off timeout to internal interface." into ↵Jeff Brown2014-11-111-5/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | Move device admin max screen off timeout to internal interface.Jeff Brown2014-11-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting was previously exposed in IPowerManager but it doesn't need to be there. Bug: 17656076 Change-Id: If3ed0cbe89f67c60aa00376be0c54b1bd9656144
* | | | | | | | | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into ↵Adam Lesinski2014-11-111-0/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 1e2e05b * commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6': AAPT: Ignore densities specified in -c flag
| * | | | | | | | | Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-devAdam Lesinski2014-11-111-0/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | AAPT: Ignore densities specified in -c flagAdam Lesinski2014-11-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --preferred-density flag knows how to handle missing resources of specific densities. Using -c with a density leads to missing resources. Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8
* | | | | | | | | | | am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ↵Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aapt" * commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67': Fixing NULL pointer access causing segmentation fault in aapt
| * | | | | | | | | | Merge "Fixing NULL pointer access causing segmentation fault in aapt"Adam Lesinski2014-11-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where resource packages are generated which does not have public resources for all resource types - NULL pointers sneaks into the mOrderedConfigs vector causing the aapt tool to crash. The solution in this fix simply ignores the NULL elements when later processing the sorted vector. The NULL elements are inserted during applyPublicEntryOrder function call Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
* | | | | | | | | | | | am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object ↵Deepanshu Gupta2014-11-112-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animator." into lmp-dev automerge: 8f6e7a8 * commit '8f6e7a868ce7715184a0d9239c6a72d269083c38': Don't skip loading object animator.
| * | | | | | | | | | | am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into ↵Deepanshu Gupta2014-11-112-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '5ad9b395db341b3360d481039f152f8ce1d8360c': Don't skip loading object animator.
| | * | | | | | | | | | am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-devDeepanshu Gupta2014-11-112-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa': Don't skip loading object animator.
| | | * | | | | | | | | Don't skip loading object animator.Deepanshu Gupta2014-11-112-1/+2
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used by Buttons as part of StateListAnimator. Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
* | | | | | | | | | | am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: ↵Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be593a7 * commit 'c78b33d01187336d960457980acb05cac86241be': split-select: fix OSX build
| * | | | | | | | | | split-select: fix OSX buildAdam Lesinski2014-11-103-6/+6
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang is a bit stricter about what template definition it chooses for mixed types that are normally possible to cast between. Operations like std::find(int iterator, int iterator, enum) will fail, as Clang won't implicitly cast an enum to an int here. Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4
* | | | | | | | | | am 1521303f: Merge "kill OS_CASE_SENSITIVE"Yabin Cui2014-11-111-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1521303f0e4264c1d4ede0250620ad236d485ae0': kill OS_CASE_SENSITIVE
| * | | | | | | | | kill OS_CASE_SENSITIVEYabin Cui2014-11-101-1/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18314594 Change-Id: Ib11b45d2597b2576bc7df2d0167ce1bbd1449523
| * | | | | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9295a1354eb8220be9a0a40985253c6cdfac35c3': Fix an overflow found by ASAN.
| * \ \ \ \ \ \ \ \ am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ↵Adam Lesinski2014-10-201-1/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad': AAPT: Fix path for final generated resources on Windows
| * \ \ \ \ \ \ \ \ \ am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ↵Adam Lesinski2014-10-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derived on Windows" into lmp-dev * commit '3cd840f4b5a2988700a6b366fa32f4565c319900': AAPT: Fix an issue where a resource name was incorrectly derived on Windows
| * \ \ \ \ \ \ \ \ \ \ am f47f8855: Merge "Added a daemon mode to aapt to receive streams of ↵Jerome Dochez2014-10-104-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commands from gradle." into lmp-dev * commit 'f47f8855175213b4bf1014593f97bc81c042dfd1': Added a daemon mode to aapt to receive streams of commands from gradle.
| * \ \ \ \ \ \ \ \ \ \ \ am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data ↵Elliott Hughes2014-10-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure." * commit 'b68fe9e5f355a3d13ed74cb89fb3e3818b356cee': Track change to private libcore data structure.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '908a4f9a4372a9627e821b5800936095b0f0b5b0': Exclude KXmlParser from LayoutLib.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v ↵Adam Lesinski2014-10-031-20/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag" into lmp-dev * commit 'a80aba70728c2843df94474dbd7829dadb77855f': AAPT: Gate v21 resource synthesizing logging behind -v flag
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c74a2b34: Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d': Minor style changes.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-024-141/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '152d9aae631381ea28f5701168d372a1486a7502': Frameworks/base: Fix more aapt issues
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-0113-387/+540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-devDeepanshu Gupta2014-10-022-202/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c': Always resolve enum when resolving resources.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-devStephen Hines2014-10-012-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70de9c0d585dcfe71e2cfd921438071e69ff5c45': include direct.h for _mkdir
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-015-142/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea93ad20b44f0183f1868f078dd7982b2798fcd3
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 052c4c4b: Merge "Update time in layout preview" into lmp-devDeepanshu Gupta2014-09-301-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '052c4c4b7a18c6c5e7bf688a647ed142167deddb': Update time in layout preview
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually ↵Adam Lesinski2014-09-262-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | showing up" into lmp-dev * commit '0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a': AAPT: Fix issue with synthesized resource not actually showing up
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private ↵Adam Lesinski2014-09-229-36/+316
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute fix" into lmp-dev * commit '36b5795fc9e9a2eed320a0d626bce44a8c231f6b': AAPT: Continuation of public/private attribute fix
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-193-3/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
generated by cgit v1.1 at 2025-02-19 09:27:37 +0000