summaryrefslogtreecommitdiff
path: root/Android.mk
AgeCommit message (Collapse)Author
2014-06-09Merge from Chromium at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
2014-04-10Merge from Chromium at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
2014-04-03Build fix for arm64.Torne (Richard Coles)
Temporarily land part of the multilib makefile changes to fix the 32-bit webrtc build for arm64 devices. Change-Id: Id8e11c46cc3538462e264fdc1a3dc5a35b440f9e
2013-11-28Merge from Chromium at DEPS revision 237746Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
2013-07-17Merge from Chromium at DEPS revision r212014Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
2013-07-10Merge from Chromium at DEPS revision r210036Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
2013-03-28Merge from Chromium at DEPS revision r190564Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
2012-11-14Merge from Chromium at DEPS revision r167172Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab