summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
|\
| * am c1ac011a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-07-069-29/+29
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-065-22/+22
* | | Import translations. DO NOT MERGEBaligh Uddin2014-06-252-2/+2
* | | Import translations. DO NOT MERGEBaligh Uddin2014-05-215-7/+7
* | | Import translations. DO NOT MERGEBaligh Uddin2014-04-222-2/+2
* | | am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release...Baligh Uddin2014-03-200-0/+0
|\| |
| * | am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658Baligh Uddin2014-03-200-0/+0
| |\|
| | * keep history after reset to ub-now-lunchbox-release@1069658Baligh Uddin2014-03-190-0/+0
| | |\
* | | | am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox...Huy Nguyen2014-03-200-0/+0
|\| | |
| * | | am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Huy Nguyen2014-03-202-6/+42
| |\| |
* | | | am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox...Mark Ashdown2014-03-200-0/+0
|\| | |
| * | | am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Mark Ashdown2014-03-201-1/+0
| |\ \ \
* | | | | am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox...Huy Nguyen2014-03-200-0/+0
|\| | | |
| * | | | am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Huy Nguyen2014-03-202-1/+10
| |\ \ \ \
* | | | | | am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox...Mark Ashdown2014-03-200-0/+0
|\| | | | |
| * | | | | am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Mark Ashdown2014-03-2068-273/+245
| |\ \ \ \ \
* | | | | | | am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox...Mathew Inwood2014-03-200-0/+0
|\| | | | | |
| * | | | | | am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Mathew Inwood2014-03-2012-111/+334
| |\ \ \ \ \ \
* | | | | | | | am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox...Juan Silveira2014-03-200-0/+0
|\| | | | | | |
| * | | | | | | am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Juan Silveira2014-03-208-67/+175
| |\ \ \ \ \ \ \
* | | | | | | | | am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox...Anton Hansson2014-03-200-0/+0
|\| | | | | | | |
| * | | | | | | | am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Anton Hansson2014-03-205-8/+93
| |\ \ \ \ \ \ \ \
* | | | | | | | | | am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-no...Adam Skory2014-03-200-0/+0
|\| | | | | | | | |
| * | | | | | | | | am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Adam Skory2014-03-204-24/+48
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ keep history after reset to ub-now-lunchbox-release@1069658Baligh Uddin2014-03-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox...Adam Skory2014-03-202-9/+16
| |\| | | | | | | | |
| | * | | | | | | | | am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunch...Adam Skory2014-03-202-9/+16
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox...Adam Skory2014-03-2011-41/+205
| |\| | | | | | | | | |
| | * | | | | | | | | | am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into releaseAdam Skory2014-03-2011-41/+205
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import t...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | am beb7bc60: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-201-2/+2
| * | | | | | | | | | | | | am 9bc59c20: Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into k...Geoff Mendal2014-02-20112-816/+1986
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aospGeoff Mendal2014-02-20112-816/+1986
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | reset to klp-dev at 9a69cbb with historyQiwen Zhao2014-02-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | keep history after reset to git reset to 279b0385d04427d039c10bc22df2a2aaafd9...Jim Guggemos2014-02-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermi...Tom Stamm2014-02-151-1/+5
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into krTom Stamm2014-02-151-1/+5
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge remote-tracking branch 'goog/jb-ub-now-kermit' into krTom Stamm2014-02-051-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.g...Qiwen Zhao2014-02-150-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google....Qiwen Zhao2014-02-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 0f3e2065: Merge commit \'8fa85d20\' into klp-dev-plus-aospQiwen Zhao2014-02-151-2/+2
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge commit '8fa85d20' into klp-dev-plus-aospQiwen Zhao2014-02-14108-647/+1603
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-releaseAdam Skory2014-02-031-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6b524fe0: am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-releaseIan Parkinson2014-02-151-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-releaseIan Parkinson2014-02-151-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge Launcher3 jb-ub-now-kermit to kermit-releaseIan Parkinson2014-01-271-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \