am da324195: am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe'

* commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe':
  Images.Media.DATE_TAKEN should be in milliseconds.