summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Removing setChildrenLayersEnabledMichael Jurka2012-06-282-47/+2
* am c4d7721c: am 806a3602: Merge "Update documentation on max widget bitmap us...Michael Jurka2012-06-251-2/+2
|\
| * am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-devMichael Jurka2012-06-251-2/+2
| |\
| | * Merge "Update documentation on max widget bitmap usage" into jb-devMichael Jurka2012-06-251-2/+2
| | |\
| | | * Update documentation on max widget bitmap usageMichael Jurka2012-06-251-2/+2
* | | | Merge "Fix broken build when DEBUG_GLYPHS is set"Raph Levien2012-06-251-2/+2
|\ \ \ \
| * | | | Fix broken build when DEBUG_GLYPHS is setRaph Levien2012-06-251-2/+2
* | | | | am 451f0341: am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unesca...Scott Main2012-06-251-42/+31
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities"...Scott Main2012-06-251-42/+31
| |\ \ \ | | |/ /
| | * | Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-devScott Main2012-06-251-42/+31
| | |\ \
| | | * | docs: clean up javadoc code snippets, unescaped entitiesScott Main2012-06-251-42/+31
| * | | | am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-2529-116/+58
| |\ \ \ \ | | |/ / /
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-2529-116/+58
| | |/ /
* | | | Import translations. DO NOT MERGEEric Fischer2012-06-2529-116/+58
* | | | Merge "Remove AudioRecord record_flags"Glenn Kasten2012-06-251-1/+0
|\ \ \ \
| * | | | Remove AudioRecord record_flagsGlenn Kasten2012-06-221-1/+0
* | | | | am 0c511988: am b0efc7fc: eat comment so it doesn\'t appear in docsScott Main2012-06-231-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am b0efc7fc: eat comment so it doesn\'t appear in docsScott Main2012-06-231-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | eat comment so it doesn't appear in docsScott Main2012-06-231-0/+1
* | | | | am 695b2d08: am 5f77f82e: Merge "Another case of extra ">""Jean-Baptiste Queru2012-06-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 5f77f82e: Merge "Another case of extra ">""Jean-Baptiste Queru2012-06-231-1/+1
| |\ \ \ \
| | * \ \ \ Merge "Another case of extra ">""Jean-Baptiste Queru2012-06-231-1/+1
| | |\ \ \ \
| | | * | | | Another case of extra ">"Shachar Shemesh2012-06-101-1/+1
* | | | | | | am 6c1f2b13: am b8b47c22: Merge "Remove redundant ">""Jean-Baptiste Queru2012-06-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b8b47c22: Merge "Remove redundant ">""Jean-Baptiste Queru2012-06-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove redundant ">""Jean-Baptiste Queru2012-06-231-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Remove redundant ">"Shachar Shemesh2012-06-101-1/+1
* | | | | | | am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aospJean-Baptiste Queru2012-06-232-2/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of f8f76d52 to jb-dev-plus-aospJean-Baptiste Queru2012-06-232-2/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add the possibility to modify the View focus rect"Jean-Baptiste Queru2012-06-232-2/+14
| | |\ \ \ \ \
| | | * | | | | Add the possibility to modify the View focus rectTobias Dubois2012-06-052-2/+14
* | | | | | | | am 56fbd14f: am 1b4ea7ef: Sanity check while updating volume in MediaRouteCho...Adam Powell2012-06-231-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialogAdam Powell2012-06-231-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Sanity check while updating volume in MediaRouteChooserDialogAdam Powell2012-06-221-0/+2
* | | | | | | | am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteB...Adam Powell2012-06-231-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am fd3fd482: Merge "Update route count properly when MediaRouteButton detects...Adam Powell2012-06-231-0/+11
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Update route count properly when MediaRouteButton detectsAdam Powell2012-06-221-0/+11
| * | | | | | | am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2249-103/+199
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2249-103/+199
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2249-103/+199
* | | | | | | | | Merge "Move ARP test functionality to ArpPeer"Irfan Sheriff2012-06-221-1/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move ARP test functionality to ArpPeerIrfan Sheriff2012-06-211-1/+41
* | | | | | | | | | Merge "Deprecate DatabaseUtils.InsertHelper."Jeff Brown2012-06-221-12/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate DatabaseUtils.InsertHelper.Jeff Brown2012-06-221-12/+32
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-06-2249-103/+199
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2249-103/+199
* | | | | | | | | | | | am 8a0f63bb: am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar h...Adam Powell2012-06-221-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into ...Adam Powell2012-06-221-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-devAdam Powell2012-06-221-2/+30
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Allow sloppy touch targeting on Action Bar home/upAdam Powell2012-06-221-2/+30