summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Add multinetwork netd callsRobert Greenwalt2014-05-142-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13732575 Change-Id: I7f030bd63971ff71d32a221e50318c781e7f2370
* | | | | | Merge "Stop adding host routes for dns"Lorenzo Colitti2014-05-141-25/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Stop adding host routes for dnsRobert Greenwalt2014-05-141-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13550136 Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
* | | | | | Merge "Handle media key events correctly on Keyguard."Jorim Jaggi2014-05-145-1/+21
|\ \ \ \ \ \
| * | | | | | Handle media key events correctly on Keyguard.Jorim Jaggi2014-05-145-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14490267 Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
* | | | | | | Merge "Fix Keyboard over Keyguard when password is set."Jorim Jaggi2014-05-142-1/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix Keyboard over Keyguard when password is set.Jorim Jaggi2014-05-142-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14842750 Change-Id: Ie7d92ee60191f8083c8ff65aba3754c71e4a5819
* | | | | | | Merge "Ensure only enabled profile apps can be launched"Alexandra Gherghina2014-05-141-3/+30
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Ensure only enabled profile apps can be launchedAlexandra Gherghina2014-05-141-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I396e99eb6b8a957d994962300eeffeec61d7c46a Bug: 13691041
* | | | | | | Merge "Use java.util.Objects"Yohei Yukawa2014-05-141-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Use java.util.ObjectsYohei Yukawa2014-05-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for I451544fba746a76618. This CL replaces libcore.util.Objects with java.util.Objects as java.util.Objects is getting more and more widely used in Android. There should be no behavioural change anyway. Change-Id: Id9568ee98aa3845588017c3711e7d03a3481beea
* | | | | | | | Merge "A better auto brightness"Adrian Roos2014-05-144-33/+59
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | A better auto brightnessAdrian Roos2014-05-144-33/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14927472 Change-Id: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
* | | | | | | | Merge "Support IMM#updateCursorAnchorInfo in Editor"Yohei Yukawa2014-05-141-2/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | Support IMM#updateCursorAnchorInfo in EditorYohei Yukawa2014-05-141-2/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this CL, Editor starts calling IMM#updateCursorAnchorInfo iff IMM#isWatchingCursor(View) returns true. The performance regression should be negligible when IMM#isWatchingCursor(View) returns false. BUG: 14579622 Change-Id: Ib35a6f4201b26d837a6aa07d1204c9eb75404da1
* | | | | | | | | Merge "Add Network-specific host name resolution API."Robert Greenwalt2014-05-141-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Network-specific host name resolution API.Paul Jensen2014-05-131-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
* | | | | | | | | | Fix NPE while dispatching input event.Chulwoo Lee2014-05-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - occasionally, TvView can be detached while the input event is being processed. BUG: 14791903 Change-Id: Id1def32ace1bf9765ae30a00ea4579670d1d40aa
* | | | | | | | | | Add NetworkFactory support.Robert Greenwalt2014-05-135-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a protocol allowing transports to dynamically register with CS for Handler to Handler communications. bug:13885501 Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
* | | | | | | | | | Merge "Add NetworkAgent"Robert Greenwalt2014-05-141-0/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add NetworkAgentRobert Greenwalt2014-05-141-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used as a bag for a details about a Network and its state. bug:13885501 Change-Id: I19cdaf3a833a9dad1df84591b8efd5045c67f38c (cherry picked from commit 344279bb3e0e521d4ca5f8c94a8f0bd235059aa3)
* | | | | | | | | | | Merge "Tweak EdgeEffect"Adam Powell2014-05-142-43/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweak EdgeEffectAdam Powell2014-05-132-43/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the effect less prominent/bulbous and not hit limits quite so easily. Change-Id: Ib8fdc29867276e6d0db447b60db0d7be3503d4d8
* | | | | | | | | | | | Fix buildAlan Viverette2014-05-134-71/+34
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I595d4e1b4a044a454c77526696c7edc70ac57f88
* | | | | | | | | | | Fix crash in cast tile.John Spurlock2014-05-133-41/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf2b35213d46b138b7ac866222950c6ddb48433f
* | | | | | | | | | | Merge "Pass ActivityOptions back from finishing activity."Craig Mautner2014-05-1412-75/+132
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pass ActivityOptions back from finishing activity.Craig Mautner2014-05-1312-75/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding an ActivityOptions parameter to convertToTranslucent provides a mechanism for delivering these options to the activity that launched the one that is returning. Fixes bug 13032208. Fixes bug 14469460. Fixes bug 14597427. Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
* | | | | | | | | | | | am 406e38bd: am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am ↵Deepanshu Gupta2014-05-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '406e38bd20b0cc0dc60c0a9d132566490c0672af': Fix build due to incorrect merges [DO NOT MERGE]
| * | | | | | | | | | | am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am ↵Deepanshu Gupta2014-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '80816bfcaf487535a45a7e6f271341eaede653b1': Fix build due to incorrect merges [DO NOT MERGE]
| | * \ \ \ \ \ \ \ \ \ \ am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am ↵Deepanshu Gupta2014-05-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit 'f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8': Fix build due to incorrect merges [DO NOT MERGE]
| | | * \ \ \ \ \ \ \ \ \ \ am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am ↵Deepanshu Gupta2014-05-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '9916c17e6606607bbadacc4fb113018ecb7fcb41': Fix build due to incorrect merges [DO NOT MERGE]
| | | | * \ \ \ \ \ \ \ \ \ \ am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am ↵Deepanshu Gupta2014-05-140-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '472cbad479b0f1361c816a2c0d5accb776fa3841': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | * \ \ \ \ \ \ \ \ \ \ am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am ↵Deepanshu Gupta2014-05-140-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit 'f57871f799300614d37e93e376f9381fd01c2bcb': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | * \ \ \ \ \ \ \ \ \ \ am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved ↵Deepanshu Gupta2014-05-140-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '888dad0df765256f4b47268400425103106894f0': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | * \ \ \ \ \ \ \ \ \ \ am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for ↵Deepanshu Gupta2014-05-140-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of e0be42a9 to jb-mr1.1-dev * commit 'f33a2f62a54ef966375a7fe8706ce713386d843e': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of ↵Deepanshu Gupta2014-05-140-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0be42a9 to jb-mr1.1-dev * commit 'f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to ↵Deepanshu Gupta2014-05-130-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '273c5c3c4c74d29a127e614726ce2e5c5e274c20': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-devDeepanshu Gupta2014-05-130-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ca7a039f73e5cf84f85282cf05d637517be2a17': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of e0be42a9 to jb-mr1.1-devDeepanshu Gupta2014-05-130-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40bfb60efa0e92259a417a5cbfd6095759c678b7': Fix build due to incorrect merges [DO NOT MERGE]
| | | | | | | | | | | | | * | | | | | | | | | | Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
* | | | | | | | | | | | | | | | | | | | | | | | am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am ↵Deepanshu Gupta2014-05-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'c1a7440094c94f4369f04f062485c9ea1162a78b': Fix build
| * | | | | | | | | | | | | | | | | | | | | | | am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am ↵Deepanshu Gupta2014-05-141-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc': Fix build
| | * | | | | | | | | | | | | | | | | | | | | | am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am ↵Deepanshu Gupta2014-05-141-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6': Fix build
| | | * | | | | | | | | | | | | | | | | | | | | am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit '3a559d56a627687d56dc06cc459ef1e7e6b1cd79': Fix build
| | | | * | | | | | | | | | | | | | | | | | | | am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae': Fix build
| | | | | * | | | | | | | | | | | | | | | | | | am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85ec1445: am f266873c: am 1c55797d: Fix build * commit '98822f0eba746b4f8c8a622f21c2d32dad08453f': Fix build
| | | | | | * | | | | | | | | | | | | | | | | | am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f266873c: am 1c55797d: Fix build * commit '6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4': Fix build
| | | | | | | * | | | | | | | | | | | | | | | | am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c55797d: Fix build * commit '90d57721692e45fe6259136296e3cd5b669443fc': Fix build
| | | | | | | | * | | | | | | | | | | | | | | | am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-141-1/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '209745a32f0a68584aba57acf7c8d1de633b1cda': Fix build